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-04-09 11:25:30 +02:00
2023-07-12 09:47:08 +02:00
2021-05-17 22:36:08 +02:00
2023-08-02 19:32:48 +02:00
2023-10-03 15:24:12 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-13 09:36:07 +02:00
2023-07-12 09:47:08 +02:00
2020-06-27 20:20:11 +02:00
2023-08-18 08:18:40 +02:00
2023-07-12 09:47:08 +02:00
2023-10-13 19:00:53 +02:00
2023-10-08 17:21:12 +02:00
2023-07-21 13:17:43 +02:00
2023-07-12 09:47:08 +02:00
2023-10-16 13:39:25 +02:00
2023-10-13 19:00:53 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-13 09:36:07 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2019-10-10 06:48:53 +02:00
2020-04-03 13:06:34 +02:00
2022-10-19 22:08:10 +02:00
2023-07-12 09:47:08 +02:00
2023-09-04 09:46:33 +02:00
2023-07-13 09:36:07 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-09-21 14:00:51 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-10-03 15:24:12 +02:00
2023-07-12 09:47:08 +02:00
2017-06-23 18:50:53 +02:00
2023-09-28 15:48:47 +02:00
2022-10-26 12:10:48 +02:00
2023-09-02 14:44:47 +02:00
2016-12-06 17:19:26 +01:00
2023-08-03 20:28:14 +02:00
2023-07-12 09:47:08 +02:00
2023-06-07 01:53:50 +02:00
2021-04-09 02:31:20 +02:00
2023-07-12 09:47:08 +02:00
2023-07-28 23:11:45 +02:00
2018-10-04 12:36:53 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00