Claire 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars.		2023-06-25 14:27:38 +02:00
..
admin
account_moderation_note_policy.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
account_policy.rb
account_warning_policy.rb
account_warning_preset_policy.rb
announcement_policy.rb
appeal_policy.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
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	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
settings_policy.rb
status_policy.rb
tag_policy.rb
user_policy.rb
user_role_policy.rb
webhook_policy.rb