Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring

2022-12-15 20:25:25 +01:00

..

access_token_tracking_concern.rb

…

account_controller_concern.rb

…

account_owned_concern.rb

…

accountable_concern.rb

…

admin_export_controller_concern.rb

Fix various issues with domain block import (#1944)

2022-11-17 11:42:20 +01:00

authorization.rb

…

cache_concern.rb

…

captcha_concern.rb

…

challengable_concern.rb

…

export_controller_concern.rb

…

localized.rb

…

rate_limit_headers.rb

Fix single name variables on controller folder (#20092)

2022-12-15 17:11:58 +01:00

registration_spam_concern.rb

…

session_tracking_concern.rb

…

signature_authentication.rb

…

signature_verification.rb

Fix single name variables on controller folder (#20092)

2022-12-15 17:11:58 +01:00

theming_concern.rb

…

two_factor_authentication_concern.rb

…

user_tracking_concern.rb

…

web_app_controller_concern.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-10-28 19:23:58 +02:00