mastodon/app/controllers/concerns
Claire b61c3ddff8 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged.
2022-01-16 18:11:20 +01:00
..
account_controller_concern.rb
account_owned_concern.rb
accountable_concern.rb
authorization.rb
cache_concern.rb
challengable_concern.rb
export_controller_concern.rb
localized.rb
rate_limit_headers.rb
registration_spam_concern.rb
session_tracking_concern.rb
sign_in_token_authentication_concern.rb
signature_authentication.rb
signature_verification.rb
status_controller_concern.rb
two_factor_authentication_concern.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
user_tracking_concern.rb Remove IP tracking columns from users table (#16409) 2022-01-16 13:23:50 +01:00