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
..
access_tokens_vacuum.rb	Add retention policy for cached content and media (#19232)	2022-09-27 03:08:19 +02:00
backups_vacuum.rb	Add retention policy for cached content and media (#19232)	2022-09-27 03:08:19 +02:00
feeds_vacuum.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-12 10:15:46 +01:00
media_attachments_vacuum.rb	Fix vacuum scheduler missing lock, locks never expiring (#19458)	2022-10-26 12:10:48 +02:00
preview_cards_vacuum.rb	Fix vacuum scheduler missing lock, locks never expiring (#19458)	2022-10-26 12:10:48 +02:00
statuses_vacuum.rb	Fix/remove calling private method with send in model (#22951)	2023-01-11 21:57:24 +01:00
system_keys_vacuum.rb	Add retention policy for cached content and media (#19232)	2022-09-27 03:08:19 +02:00