Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		2019-08-29 12:07:50 +02:00
..
account_actions_controller.rb
account_moderation_notes_controller.rb
accounts_controller.rb
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_allows_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
domain_blocks_controller.rb	Add domain block notes (#11515)	2019-08-07 20:20:23 +02:00
email_domain_blocks_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
followers_controller.rb
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	Add invite request to pending account notification e-mail (#10528)	2019-04-10 00:36:01 +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	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