You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		4 years ago
..
account_moderation_note_policy.rb	…
account_policy.rb	Fix admins being able to suspend their instance actor (#14567)	4 years ago
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)	4 years ago
email_domain_block_policy.rb	…
follow_recommendation_policy.rb	Add cold-start follow recommendations (#15945)	4 years ago
instance_policy.rb	…
invite_policy.rb	…
ip_block_policy.rb	Add IP-based rules (#14963)	4 years ago
poll_policy.rb	…
relay_policy.rb	…
report_note_policy.rb	…
report_policy.rb	…
rule_policy.rb	Add server rules (#15769)	4 years ago
settings_policy.rb	…
status_policy.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
tag_policy.rb	…
user_policy.rb	…