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
..
2020-01-23 22:00:13 +01:00
2020-06-02 19:24:53 +02:00
2020-06-02 19:24:53 +02:00
2022-05-25 12:27:11 +02:00
2020-06-02 19:24:53 +02:00
2020-06-02 19:24:53 +02:00