mastodon/app/controllers/admin
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
..
trends Add trending links (#16917) 2021-11-25 13:07:38 +01:00
account_actions_controller.rb
account_moderation_notes_controller.rb
accounts_controller.rb Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
action_logs_controller.rb Add ability to filter audit log in admin UI (#13381) 2020-04-03 13:06:34 +02:00
announcements_controller.rb Change order of announcements in admin page to sort them newest-first (#15091) 2020-11-04 21:15:22 +01:00
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb Fix unpermitted operations on custom emojis leading to cryptic errors (#13951) 2020-06-05 15:23:27 +02:00
dashboard_controller.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
domain_allows_controller.rb
domain_blocks_controller.rb Further preparation for Rails 6 (#15916) 2021-03-19 02:45:34 +01:00
email_domain_blocks_controller.rb Improve email address validation (#14565) 2020-08-12 12:40:25 +02:00
follow_recommendations_controller.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
instances_controller.rb Add management of delivery availability in Federation settings (#15771) 2021-05-05 23:39:02 +02:00
invites_controller.rb
ip_blocks_controller.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
relationships_controller.rb
relays_controller.rb
report_notes_controller.rb
reported_statuses_controller.rb
reports_controller.rb
resets_controller.rb Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
roles_controller.rb
rules_controller.rb Add server rules (#15769) 2021-02-21 19:50:12 +01:00
settings_controller.rb
sign_in_token_authentications_controller.rb Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
site_uploads_controller.rb
statuses_controller.rb Fix admin statuses order(#16937) (#16969) 2021-11-26 22:12:27 +01:00
subscriptions_controller.rb
tags_controller.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
two_factor_authentications_controller.rb Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
warning_presets_controller.rb