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-03-17 19:23:39 +01:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-06 01:03:53 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-06 01:03:53 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-10 09:39:15 +01:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-06 01:03:53 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-12 10:15:46 +01:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-06 01:03:53 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-06 01:03:53 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-12 10:15:46 +01:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2022-11-17 21:59:15 +09:00
2022-11-25 09:40:05 +09:00
2022-11-17 21:59:15 +09:00
2022-03-17 09:33:25 +09:00
2022-12-10 00:12:56 +09:00
2022-05-06 21:53:22 +09:00
2021-05-08 17:12:56 +02:00
2022-11-17 21:59:15 +09:00
2022-11-17 21:59:15 +09:00
2022-06-04 13:44:49 +09:00
2022-11-01 18:42:04 +09:00
2022-12-16 12:46:39 +09:00
2022-11-01 18:42:04 +09:00
2022-11-17 21:59:15 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00
2023-01-11 21:41:34 +09:00