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.		2021-07-08 16:17:19 +02:00
..
account_moderation_note_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
account_policy.rb
account_warning_preset_policy.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
announcement_policy.rb
application_policy.rb
backup_policy.rb
custom_emoji_policy.rb
delivery_policy.rb
domain_allow_policy.rb
domain_block_policy.rb
email_domain_block_policy.rb
follow_recommendation_policy.rb
instance_policy.rb
invite_policy.rb	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
ip_block_policy.rb
poll_policy.rb
relay_policy.rb
report_note_policy.rb	Feature: Report improvements (#6967) (#7000)	2018-04-02 22:04:14 +02:00
report_policy.rb
rule_policy.rb
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
tag_policy.rb
user_policy.rb