mirror of https://github.com/tootsuite/mastodon
537afa00f3
Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, glitch-soc-only DM-related method too close to changed upstream stuff. Ported upstream changes. - `app/services/batched_remove_status_service.rb`: Additional logic in glitch-soc to clear DMs from timelines. Ported upstream changes and fixed the DM TL clearing logic. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Additional code in glitch-soc to clear DM timelines. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| assets.rake | ||
| auto_annotate_models.rake | ||
| db.rake | ||
| emojis.rake | ||
| glitchsoc.rake | ||
| mastodon.rake | ||
| repo.rake | ||
| statistics.rake | ||