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
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-20 13:05:56 +02:00
2023-09-22 11:06:48 +02:00
2023-10-05 13:13:14 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-28 10:44:16 +02:00
2023-09-13 15:10:41 +02:00
2023-09-22 11:06:48 +02:00
2023-09-06 17:23:58 +02:00
2023-09-25 10:50:09 +02:00
2023-09-22 11:06:48 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-10-16 11:31:52 +02:00
2023-10-02 13:35:29 +02:00
2023-10-16 11:31:52 +02:00
2023-09-13 15:10:41 +02:00
2023-10-02 13:35:29 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-10-11 16:37:01 +02:00
2023-09-25 10:50:09 +02:00
2023-07-13 11:49:16 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-28 10:44:16 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-06-02 15:00:27 +02:00
2023-06-05 09:52:36 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-10-16 11:31:52 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-10-10 10:06:37 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-07-13 14:22:20 +02:00
2023-09-13 15:10:41 +02:00
2023-10-06 11:49:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-10-05 13:13:14 +02:00
2023-10-09 10:32:06 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-10-11 16:37:01 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-10-06 11:49:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-10-12 10:07:40 +02:00
2023-10-16 11:31:52 +02:00
2023-09-13 15:10:41 +02:00
2023-09-19 16:26:51 +02:00
2023-10-02 13:35:29 +02:00
2023-10-02 13:35:29 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-10-10 10:06:37 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-25 10:50:09 +02:00
2023-10-16 11:31:52 +02:00
b867d4581e