about summary refs log tree commit diff
path: root/spec/controllers
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-01-12 10:15:46 +0100
committerClaire <claire.github-309c@sitedethib.com>2023-01-12 10:15:46 +0100
commit3e63fcd4f07b13ba647dfa8a3bac6b1ebbd76614 (patch)
tree756a29c017aa843ddb0773627dabb27b08e45960 /spec/controllers
parent932a22219ae99a285bdd0b69f02627f029327db3 (diff)
parent15b88a83ab7dbe022e33552f45f300fc69a934d0 (diff)
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.
Diffstat (limited to 'spec/controllers')
0 files changed, 0 insertions, 0 deletions