mastodon/app/controllers/admin
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
..
disputes
reports
settings Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00
trends Add ability to view previous edits of a status in admin UI (#19462) 2022-10-26 13:42:29 +02:00
users
webhooks
account_actions_controller.rb
account_moderation_notes_controller.rb
accounts_controller.rb Log admin approve and reject account (#22088) 2022-12-07 00:25:18 +01:00
action_logs_controller.rb
announcements_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb Fix inaccurate admin log entry for re-sending confirmation e-mails (#19674) 2022-11-02 18:50:21 +01:00
custom_emojis_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
dashboard_controller.rb
domain_allows_controller.rb
domain_blocks_controller.rb Fix changing domain block severity not undoing individual account effects (#22135) 2022-12-15 17:45:02 +01:00
email_domain_blocks_controller.rb Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2022-11-17 11:05:09 +01:00
export_domain_allows_controller.rb Fix various issues with domain block import (#1944) 2022-11-17 11:42:20 +01:00
export_domain_blocks_controller.rb Fix various issues with domain block import (#1944) 2022-11-17 11:42:20 +01:00
follow_recommendations_controller.rb
instances_controller.rb Fix some performance issues with /admin/instances (#21907) 2022-12-01 10:32:10 +01:00
invites_controller.rb
ip_blocks_controller.rb Fix IP blocks not having a unique index (#19456) 2022-10-25 21:43:44 +02:00
relationships_controller.rb
relays_controller.rb Allow adding relays while secure mode & limited federation mode are enabled (#22324) 2022-12-15 15:56:05 +01:00
report_notes_controller.rb
reports_controller.rb
resets_controller.rb
roles_controller.rb
rules_controller.rb
settings_controller.rb Change settings area to be separated into categories in admin UI (#19407) 2022-10-22 11:44:41 +02:00
site_uploads_controller.rb Change settings area to be separated into categories in admin UI (#19407) 2022-10-22 11:44:41 +02:00
statuses_controller.rb Add ability to view previous edits of a status in admin UI (#19462) 2022-10-26 13:42:29 +02:00
tags_controller.rb
warning_presets_controller.rb
webhooks_controller.rb