mastodon/app/controllers/concerns
Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +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