Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		2018-10-05 15:23:57 +02:00
..
account_moderation_notes_controller.rb
accounts_controller.rb	Change admin accounts default sort to most recent (#8813)	2018-10-04 16:05:38 +02:00
action_logs_controller.rb
base_controller.rb	Fix statuses batch checkboxes in admin panel (fixes #411)	2018-08-11 15:45:12 +02:00
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb
dashboard_controller.rb	Display trending hashtags on admin dashboard (#8038)	2018-07-16 19:21:27 +02:00
domain_blocks_controller.rb
email_domain_blocks_controller.rb
instances_controller.rb
invites_controller.rb	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
relays_controller.rb	Add federation relay support (#7998)	2018-07-13 02:16:06 +02:00
report_notes_controller.rb
reported_statuses_controller.rb
reports_controller.rb	Add confirmation step to account suspensions (#8353)	2018-08-22 11:53:41 +02:00
resets_controller.rb
roles_controller.rb
settings_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
silences_controller.rb
statuses_controller.rb	Allow to show a specific status in the admin interface	2018-09-03 18:19:11 +02:00
subscriptions_controller.rb
suspensions_controller.rb	Fix regression when suspending not from report (#8400)	2018-08-23 21:51:56 +02:00
two_factor_authentications_controller.rb