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 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		3 years ago
..
account_moderation_note_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
account_policy.rb	Fix admins being able to suspend their instance actor (#14567)	4 years ago
account_warning_preset_policy.rb	Add moderation warnings (#9519)	6 years ago
announcement_policy.rb	Add announcements (#12662)	5 years ago
application_policy.rb	Account archive download (#6460)	7 years ago
backup_policy.rb	Account archive download (#6460)	7 years ago
custom_emoji_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
delivery_policy.rb	Add management of delivery availability in Federation settings (#15771)	4 years ago
domain_allow_policy.rb	Add whitelist mode (#11291)	5 years ago
domain_block_policy.rb	Fix performance on instances list in admin UI (#15282)	4 years ago
email_domain_block_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
follow_recommendation_policy.rb	Add cold-start follow recommendations (#15945)	4 years ago
instance_policy.rb	Redesign admin instances area (#9645)	6 years ago
invite_policy.rb	Add admin function to deactivate all invites (#8279)	6 years ago
ip_block_policy.rb	Add IP-based rules (#14963)	4 years ago
poll_policy.rb	Ensure only people allowed to see the poll can actually vote (#10161)	6 years ago
relay_policy.rb	Add federation relay support (#7998)	6 years ago
report_note_policy.rb	Feature: Report improvements (#6967) (#7000)	7 years ago
report_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
rule_policy.rb	Add server rules (#15769)	4 years ago
settings_policy.rb	Add ability to delete files uploaded for settings in admin UI (#13192)	5 years ago
status_policy.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
tag_policy.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago
user_policy.rb	Add ability to skip sign-in token authentication for specific users (#16427)	3 years ago