Claire 86c9c5afa0 Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/web_app_controller_concern.rb`: Upstream changed the order of Action Controller filters for web app controllers. Glitch-soc has an extra filter due to its theming system. Changed the order accordingly. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to an extra newline in glitch-soc. Removed that newline and applied upstream's changes.		2023-10-08 17:26:43 +02:00
..
access_token_tracking_concern.rb	…
account_controller_concern.rb	…
account_owned_concern.rb	…
accountable_concern.rb	…
admin_export_controller_concern.rb	…
api_caching_concern.rb	…
authorization.rb	…
cache_concern.rb	…
captcha_concern.rb	…
challengable_concern.rb	…
export_controller_concern.rb	…
localized.rb	…
rate_limit_headers.rb	…
registration_spam_concern.rb	…
session_tracking_concern.rb	…
signature_authentication.rb	…
signature_verification.rb	…
theming_concern.rb	…
two_factor_authentication_concern.rb	…
user_tracking_concern.rb	…
web_app_controller_concern.rb	Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream	2023-10-08 17:26:43 +02:00