Claire b867d4581e Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream ... Conflicts: - `spec/controllers/api/v1/timelines/tag_controller_spec.rb`: Glitch-soc had a few extra lines in this file to account for a different default setting. This file got replaced by `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc additions were moved too. Additional changes: - `spec/requests/api/v1/statuses/sources_spec.rb`: Add glitch-soc-only attribute `content_type`.		2023-10-17 21:35:07 +02:00
..
activity	Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream	2023-07-30 16:11:55 +02:00
adapter_spec.rb	Fix Lint/ConstantDefinitionInBlock cop (#24763)	2023-05-03 10:32:30 +02:00
dereferencer_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
linked_data_signature_spec.rb	Remove unused stub json ld context (#25454)	2023-10-16 15:38:27 +02:00
tag_manager_spec.rb	Add stricter protocol fields validation for accounts (#25937)	2023-07-20 18:23:48 +02:00