Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.		2020-09-28 14:13:30 +02:00
..
account_actions_controller.rb
account_moderation_notes_controller.rb
accounts_controller.rb	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
action_logs_controller.rb	Add ability to filter audit log in admin UI (#13381)	2020-04-03 13:06:34 +02:00
announcements_controller.rb	Add publish/unpublish controls to announcements in admin UI (#12967)	2020-01-27 11:05:33 +01:00
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb	Fix unpermitted operations on custom emojis leading to cryptic errors (#13951)	2020-06-05 15:23:27 +02:00
dashboard_controller.rb
domain_allows_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
domain_blocks_controller.rb
email_domain_blocks_controller.rb	Improve email address validation (#14565)	2020-08-12 12:40:25 +02:00
instances_controller.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	2020-04-15 20:33:24 +02:00
invites_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
pending_accounts_controller.rb
relationships_controller.rb	Fix relationships page not showing results in admin UI (#12934)	2020-01-24 00:20:23 +01:00
relays_controller.rb	Fix relays UI being available in whitelist/secure mode (#11963)	2019-09-27 02:13:34 +02:00
report_notes_controller.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
reported_statuses_controller.rb
reports_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
resets_controller.rb
roles_controller.rb
settings_controller.rb
site_uploads_controller.rb	Add ability to delete files uploaded for settings in admin UI (#13192)	2020-03-08 16:00:24 +01:00
statuses_controller.rb
subscriptions_controller.rb
tags_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
two_factor_authentications_controller.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
warning_presets_controller.rb	Add titles to warning presets in admin UI (#13252)	2020-03-12 17:57:59 +01:00