Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.		2023-04-29 10:44:56 +02:00
..
access_token_tracking_concern.rb
account_controller_concern.rb	Move link header setting to after_action (#24251)	2023-03-26 00:40:01 +01:00
account_owned_concern.rb
accountable_concern.rb
admin_export_controller_concern.rb	Change domain block CSV parsing to be more robust and handle more lists (#21470)	2023-01-18 16:20:52 +01:00
api_caching_concern.rb	Change unauthenticated responses to be cached in REST API (#24348)	2023-04-25 15:41:34 +02:00
authorization.rb
cache_concern.rb	Fix /api/v1/instance/domain_blocks being unconditionally cached (#24662)	2023-04-26 11:42:47 +02:00
captcha_concern.rb
challengable_concern.rb
export_controller_concern.rb
localized.rb
rate_limit_headers.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
registration_spam_concern.rb
session_tracking_concern.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
signature_authentication.rb
signature_verification.rb	Autofix Rubocop Style/RedundantArgument (#23798)	2023-03-16 10:34:00 +09:00
theming_concern.rb
two_factor_authentication_concern.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
user_tracking_concern.rb
web_app_controller_concern.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00