1
0
mirror of https://github.com/funamitech/mastodon synced 2024-11-30 07:49:04 +09:00
YuruToot/app/controllers/admin
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
..
account_moderation_notes_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
accounts_controller.rb Clean up admin UI for accounts (#6004) 2017-12-13 12:15:10 +01:00
action_logs_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
base_controller.rb Merge branch 'gs-master' into glitch-theme 2017-12-04 11:07:01 -06:00
confirmations_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
custom_emojis_controller.rb keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114) 2017-12-30 02:43:43 +01:00
domain_blocks_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
email_domain_blocks_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
instances_controller.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
invites_controller.rb Add invite filter (#5862) 2017-12-01 16:40:02 +01:00
reported_statuses_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
reports_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
resets_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
roles_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
settings_controller.rb Add more instance stats APIs (#6125) 2017-12-29 19:52:04 +01:00
silences_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
statuses_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
subscriptions_controller.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
suspensions_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
two_factor_authentications_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00