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-06-28 09:42:13 +02:00
2022-10-03 18:15:47 +02:00
2022-12-19 00:51:37 +09:00
2022-12-19 00:51:37 +09:00
2022-12-19 00:51:37 +09:00
2022-12-15 16:18:39 +01:00
2020-11-16 05:16:39 +01:00
2022-12-19 00:51:37 +09:00
2022-12-19 00:51:37 +09:00
2021-05-11 14:17:38 +02:00
2017-07-08 00:06:02 +02:00
2022-12-19 00:51:37 +09:00
2022-12-21 15:59:39 +01:00
2019-09-21 20:01:16 +02:00
2022-12-19 00:51:37 +09:00
2019-08-30 00:14:36 +02:00
2022-12-19 00:51:37 +09:00
2023-01-11 21:58:46 +01:00
2022-12-19 00:51:37 +09:00
2022-12-19 00:51:37 +09:00
2022-10-16 08:43:59 +02:00
2022-11-14 08:34:07 +01:00
2022-12-19 00:51:37 +09:00
2022-02-09 01:17:07 +01:00
2022-12-19 00:51:37 +09:00
2022-05-16 11:18:35 +02:00
2020-09-01 13:31:28 +02:00
2022-12-19 00:51:37 +09:00
2022-12-19 00:51:37 +09:00
2022-12-19 00:51:37 +09:00
2022-12-19 00:51:37 +09:00
2021-04-19 14:45:15 +02:00
2021-06-25 04:45:17 +02:00
2022-12-19 00:51:37 +09:00
2019-03-06 05:35:52 +01:00
2022-02-23 21:37:02 +01:00
2022-12-19 00:51:37 +09:00
2022-10-13 14:42:37 +02:00
2022-12-19 00:51:37 +09:00
2022-12-19 00:51:37 +09:00
2022-12-19 00:51:37 +09:00
2022-06-28 09:42:13 +02:00
2022-12-19 00:51:37 +09:00
2022-08-25 04:38:01 +02:00
2022-12-19 00:51:37 +09:00
2022-04-06 22:53:29 +02:00