This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/workers/scheduler
Claire 537afa00f3 Merge branch 'master' into glitch-soc/merge-upstream
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.
2020-12-23 01:47:45 +01:00
..
backup_cleanup_scheduler.rb
doorkeeper_cleanup_scheduler.rb
email_scheduler.rb
feed_cleanup_scheduler.rb
instance_refresh_scheduler.rb
ip_cleanup_scheduler.rb
media_cleanup_scheduler.rb
pghero_scheduler.rb
scheduled_statuses_scheduler.rb
trending_tags_scheduler.rb
user_cleanup_scheduler.rb