mastodon/app/controllers/concerns
Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +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 Fix Content Security Policy sometimes unnecessarily allowing hCaptcha scripts (#26388) 2023-08-08 15:41:38 +02:00
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 '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 2023-08-13 18:47:15 +02:00