glitchier-soc/app/views/admin/trends
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
..
links Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00