Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		2021-04-20 12:17:14 +02:00
..
account_moderation_note_policy.rb
account_policy.rb	Fix admins being able to suspend their instance actor (#14567)	2020-12-15 17:23:58 +01:00
account_warning_preset_policy.rb
announcement_policy.rb
application_policy.rb
backup_policy.rb
custom_emoji_policy.rb
domain_allow_policy.rb
domain_block_policy.rb	Fix performance on instances list in admin UI (#15282)	2020-12-14 09:06:34 +01:00
email_domain_block_policy.rb
follow_recommendation_policy.rb	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00
instance_policy.rb
invite_policy.rb
ip_block_policy.rb	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
poll_policy.rb
relay_policy.rb
report_note_policy.rb
report_policy.rb
rule_policy.rb	Add server rules (#15769)	2021-02-21 19:50:12 +01:00
settings_policy.rb	Add ability to delete files uploaded for settings in admin UI (#13192)	2020-03-08 16:00:24 +01:00
status_policy.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
tag_policy.rb
user_policy.rb