Claire 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.		2023-03-22 19:50:11 +01:00
..
access_token_tracking_concern.rb	Change authorized applications page (#17656)	2022-03-01 16:48:58 +01:00
account_controller_concern.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
account_owned_concern.rb	…
accountable_concern.rb	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +02:00
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
authorization.rb	…
cache_concern.rb	Fix Rails cache namespace being overriden with `v2` for cached statuses (#24202)	2023-03-22 15:47:44 +01: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	Change authorized applications page (#17656)	2022-03-01 16:48:58 +01:00
web_app_controller_concern.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-10 09:39:15 +01:00