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