Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2022-08-28 11:31:00 +02:00
..
account_moderation_note_policy.rb	…
account_policy.rb	…
account_warning_policy.rb	…
account_warning_preset_policy.rb	…
announcement_policy.rb	…
appeal_policy.rb	…
application_policy.rb	…
audit_log_policy.rb	…
backup_policy.rb	…
canonical_email_block_policy.rb	…
custom_emoji_policy.rb	…
dashboard_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	…
ip_block_policy.rb	…
poll_policy.rb	…
preview_card_policy.rb	…
preview_card_provider_policy.rb	…
relay_policy.rb	…
report_note_policy.rb	…
report_policy.rb	…
rule_policy.rb	…
settings_policy.rb	…
status_policy.rb	…
tag_policy.rb	…
user_policy.rb	…
user_role_policy.rb	…
webhook_policy.rb	…