Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.		2023-07-12 16:03:05 +02:00
..
admin
account_moderation_note_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
account_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
account_warning_preset_policy_spec.rb
announcement_policy_spec.rb
appeal_policy_spec.rb
backup_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
canonical_email_block_policy_spec.rb
custom_emoji_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
delivery_policy_spec.rb
domain_block_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
email_domain_block_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
follow_recommendation_policy_spec.rb
instance_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
invite_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
ip_block_policy_spec.rb
preview_card_policy_spec.rb
preview_card_provider_policy_spec.rb
relay_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
report_note_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
report_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
rule_policy_spec.rb
settings_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
status_policy_spec.rb
tag_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
user_policy_spec.rb	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
webhook_policy_spec.rb