mastodon/app/controllers/admin
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
account_actions_controller.rb
account_moderation_notes_controller.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
accounts_controller.rb
action_logs_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
base_controller.rb
change_emails_controller.rb Feature: Allow staff to change user emails (#7074) 2018-04-10 09:16:06 +02:00
confirmations_controller.rb Move #set_user to Admin::BaseController (#9470) 2018-12-17 11:40:51 +01:00
custom_emojis_controller.rb
dashboard_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-08 08:44:33 +02:00
domain_allows_controller.rb
domain_blocks_controller.rb
email_domain_blocks_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
followers_controller.rb Fix list of local followers showing remote followers in admin UI (#9700) 2019-01-03 06:40:16 +01:00
instances_controller.rb Add domain block notes (#11515) 2019-08-07 20:20:23 +02:00
invites_controller.rb
pending_accounts_controller.rb
relays_controller.rb Fix relays UI being available in whitelist/secure mode (#11963) 2019-09-27 02:13:34 +02:00
report_notes_controller.rb Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
reported_statuses_controller.rb
reports_controller.rb
resets_controller.rb
roles_controller.rb Move #set_user to Admin::BaseController (#9470) 2018-12-17 11:40:51 +01:00
settings_controller.rb Add validations to admin settings (#10348) 2019-03-23 14:07:04 +01:00
statuses_controller.rb Add quick links to the admin interface in the WebUI (#8545) 2019-01-04 13:10:43 +01:00
subscriptions_controller.rb
tags_controller.rb Add search and sort functions to hashtag admin UI (#11829) 2019-09-16 14:27:29 +02:00
two_factor_authentications_controller.rb
warning_presets_controller.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00