Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.		2023-06-10 16:48:01 +02:00
..
admin	Policies specs (#23924)	2023-03-04 16:57:22 +01:00
account_moderation_note_policy_spec.rb	Fix RSpec/DescribedClass cop (#25104)	2023-06-06 13:58:33 +02:00
account_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
account_warning_preset_policy_spec.rb	Policies specs (#23924)	2023-03-04 16:57:22 +01:00
announcement_policy_spec.rb	Policies specs (#23924)	2023-03-04 16:57:22 +01:00
appeal_policy_spec.rb	Policies specs (#23924)	2023-03-04 16:57:22 +01:00
backup_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
canonical_email_block_policy_spec.rb	Policies specs (#23924)	2023-03-04 16:57:22 +01:00
custom_emoji_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
delivery_policy_spec.rb	Policies specs (#23924)	2023-03-04 16:57:22 +01:00
domain_block_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
email_domain_block_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
follow_recommendation_policy_spec.rb	Policies specs (#23924)	2023-03-04 16:57:22 +01:00
instance_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
invite_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
ip_block_policy_spec.rb	Policies specs (#23924)	2023-03-04 16:57:22 +01:00
preview_card_policy_spec.rb	Policies specs (#23924)	2023-03-04 16:57:22 +01:00
preview_card_provider_policy_spec.rb	Policies specs (#23924)	2023-03-04 16:57:22 +01:00
relay_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
report_note_policy_spec.rb	Fix RSpec/RepeatedExampleGroupDescription cop (#24850)	2023-05-12 12:25:32 +02:00
report_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
rule_policy_spec.rb	Policies specs (#23924)	2023-03-04 16:57:22 +01:00
settings_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
status_policy_spec.rb	Fix glitch-soc-only tests being broken because of test refactor	2023-05-26 00:10:57 +02:00
tag_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
user_policy_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
webhook_policy_spec.rb	Policies specs (#23924)	2023-03-04 16:57:22 +01:00