Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code		2019-09-18 17:25:56 +02:00
..
account_actions_controller.rb	Add option to include reported statuses in warning e-mail (#11639)	2019-08-23 22:37:23 +02:00
account_moderation_notes_controller.rb
accounts_controller.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
action_logs_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb	Add batch actions and categories to admin UI for custom emojis (#11793)	2019-09-09 22:44:17 +02:00
dashboard_controller.rb
domain_allows_controller.rb
domain_blocks_controller.rb	Add domain block notes (#11515)	2019-08-07 20:20:23 +02:00
email_domain_blocks_controller.rb
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	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
pending_accounts_controller.rb
relays_controller.rb
report_notes_controller.rb
reported_statuses_controller.rb	Do not error out when performing admin actions on no statuses (#10094)	2019-02-21 19:36:48 +01:00
reports_controller.rb
resets_controller.rb
roles_controller.rb
settings_controller.rb
statuses_controller.rb
subscriptions_controller.rb
tags_controller.rb
two_factor_authentications_controller.rb
warning_presets_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00