mastodon/app/controllers/concerns
Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `config/i18n-tasks.yml`:
  Upstream added new ignored strings, glitch-soc has extra ignored strings
  because of the theming system.
  Added upstream's changes.
2023-01-18 17:38:11 +01:00
..
access_token_tracking_concern.rb
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
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
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 Add more specific error messages to HTTP signature verification (#21617) 2023-01-18 16:47:56 +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 2023-01-10 09:39:15 +01:00