mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
3e63fcd4f0
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. |
||
---|---|---|
.. | ||
access_tokens_vacuum.rb | ||
backups_vacuum.rb | ||
feeds_vacuum.rb | ||
media_attachments_vacuum.rb | ||
preview_cards_vacuum.rb | ||
statuses_vacuum.rb | ||
system_keys_vacuum.rb |