Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		2018-12-23 11:28:28 +01:00
..
account_actions_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
account_moderation_notes_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
accounts_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
action_logs_controller.rb	…
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
change_emails_controller.rb	…
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	…
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
instances_controller.rb	…
invites_controller.rb	…
relays_controller.rb	…
report_notes_controller.rb	…
reported_statuses_controller.rb	…
reports_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
resets_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
roles_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
settings_controller.rb	Add admin setting to disable followers count	2018-12-20 14:51:12 +01:00
statuses_controller.rb	…
subscriptions_controller.rb	…
tags_controller.rb	…
two_factor_authentications_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
warning_presets_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00