Claire 5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream ... Conflicts: - `spec/lib/sanitize/config_spec.rb`: Upstream rewrote top-level `describe` calls to `RSpec.describe`, and glitch-soc had differences in the first few tests because of the wider subset of HTML it accepts. Changed `describe` to `RSpec.describe` as upstream did, keeping glitch-soc's tests.		2024-09-04 19:38:52 +02:00
..
admin	…
account_moderation_note_policy_spec.rb	…
account_policy_spec.rb	…
account_warning_preset_policy_spec.rb	…
announcement_policy_spec.rb	…
appeal_policy_spec.rb	…
backup_policy_spec.rb	…
canonical_email_block_policy_spec.rb	…
custom_emoji_policy_spec.rb	…
delivery_policy_spec.rb	…
domain_block_policy_spec.rb	…
email_domain_block_policy_spec.rb	…
follow_recommendation_policy_spec.rb	…
instance_policy_spec.rb	…
invite_policy_spec.rb	…
ip_block_policy_spec.rb	…
preview_card_policy_spec.rb	…
preview_card_provider_policy_spec.rb	…
relay_policy_spec.rb	…
report_note_policy_spec.rb	…
report_policy_spec.rb	…
rule_policy_spec.rb	…
settings_policy_spec.rb	…
software_update_policy_spec.rb	…
status_policy_spec.rb	…
tag_policy_spec.rb	…
user_policy_spec.rb	…
webhook_policy_spec.rb	…