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	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00
doorkeeper_cleanup_scheduler.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
email_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00
feed_cleanup_scheduler.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-23 01:47:45 +01:00
instance_refresh_scheduler.rb	Fix performance on instances list in admin UI (#15282)	2020-12-14 09:06:34 +01:00
ip_cleanup_scheduler.rb	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
media_cleanup_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00
pghero_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00
scheduled_statuses_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00
trending_tags_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00
user_cleanup_scheduler.rb	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00