Claire
3e63fcd4f0
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Minor upstream refactor moved hook definitions around,
and glitch-soc has an extra `before_create`.
Moved the `before_create` accordingly.
- `app/services/batched_remove_status_service.rb`:
Minor upstream refactor changed a block in which glitch-soc
had one extra call to handle direct timelines.
Adapted changes to keep glitch-soc's extra call.
2023-01-12 10:15:46 +01:00
..
2022-11-11 21:23:03 +01:00
2023-01-05 14:03:46 +01:00
2022-12-15 18:37:47 +01:00
2022-11-27 20:48:12 +01:00
2022-08-13 15:39:05 +02:00
2022-05-09 23:20:19 +02:00
2022-10-20 14:35:29 +02:00
2022-12-19 00:51:37 +09:00
2022-10-20 14:35:29 +02:00
2023-01-12 10:15:46 +01:00
2022-11-13 21:10:20 +01:00
2022-11-13 21:10:20 +01:00
2022-10-20 14:35:29 +02:00
2022-11-17 11:24:59 +01:00
2022-12-15 16:20:46 +01:00
2022-10-20 14:35:29 +02:00
2022-11-05 13:43:37 +01:00
2022-11-05 13:43:37 +01:00
2022-11-13 21:10:20 +01:00
2022-11-13 21:10:20 +01:00
2022-10-23 23:38:08 +02:00
2022-10-23 23:38:08 +02:00
2019-10-06 22:11:17 +02:00
2022-11-27 23:49:32 +01:00
2022-12-19 00:51:37 +09:00
2022-11-08 17:31:32 +01:00
2022-11-10 08:49:48 +01:00
2022-10-20 14:35:29 +02:00
2019-02-01 00:14:05 +01:00
2019-08-03 19:10:39 +02:00
2022-12-19 00:51:37 +09:00
2022-11-05 23:06:32 +01:00
2022-10-20 14:35:29 +02:00
2022-11-13 21:10:20 +01:00
2022-11-13 21:10:20 +01:00
2022-10-20 14:35:29 +02:00
2022-10-20 14:35:29 +02:00
2022-10-20 14:35:29 +02:00
2022-11-05 13:43:37 +01:00
2022-10-18 19:33:11 +02:00
2022-10-04 20:13:46 +02:00
2023-01-05 14:03:46 +01:00
2022-10-03 02:56:12 +02:00
2023-01-09 03:54:03 +01:00
2023-01-09 03:52:37 +01:00