Claire 8d717ab161 Merge commit '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream ...

Conflicts:
- `spec/controllers/application_controller_spec.rb`:
  Upstream moved specs that were textually-adjacent to glitch-soc ones.
  Kept the glitch-soc ones.

2026-03-09 18:14:15 +01:00

..

admin

…

api

…

auth

…

settings

…

account_controller_concern.rb

…

account_owned_concern.rb

…

accountable_concern.rb

Add action_logs association for account (#36022)

2026-01-28 11:04:00 +00:00

async_refreshes_concern.rb

…

authorization.rb

…

cache_concern.rb

…

challengable_concern.rb

Add ability to require 2FA for specific roles (including Everybody) (#37701)

2026-02-11 14:34:09 +00:00

deprecation_concern.rb

…

error_responses.rb

Extract ErrorResponses from application controller (#38105)

2026-03-09 11:30:41 +00:00

localized.rb

…

preloading_concern.rb

…

session_tracking_concern.rb

…

signature_authentication.rb

…

signature_verification.rb

…

user_tracking_concern.rb

…

web_app_controller_concern.rb

…