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	Add option to include reported statuses in warning e-mail (#11639)	2019-08-23 22:37:23 +02:00
account_moderation_notes_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
accounts_controller.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
action_logs_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb
dashboard_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-08 08:44:33 +02:00
domain_allows_controller.rb
domain_blocks_controller.rb
email_domain_blocks_controller.rb
followers_controller.rb
instances_controller.rb
invites_controller.rb
pending_accounts_controller.rb
relays_controller.rb
report_notes_controller.rb
reported_statuses_controller.rb
reports_controller.rb
resets_controller.rb
roles_controller.rb
settings_controller.rb
statuses_controller.rb
subscriptions_controller.rb
tags_controller.rb	Fix weekly usage not being displayed correctly in hashtag admin UI (#11524)	2019-08-08 23:03:28 +02:00
two_factor_authentications_controller.rb
warning_presets_controller.rb