Claire b7882a75d2 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Upstream moved things around in a place where glitch-soc had support for an extra parameter (`content_type`). Follow upstream but reintroduce `content_type`.		2022-02-10 19:09:27 +01:00
..
account_moderation_note_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
account_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
backup_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
custom_emoji_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
domain_block_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
email_domain_block_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
instance_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
invite_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
relay_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
report_note_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
report_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
settings_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
status_policy_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-10 19:09:27 +01:00
tag_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
user_policy_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00