You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		4 years ago
..
backup_cleanup_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
doorkeeper_cleanup_scheduler.rb	Add E2EE API (#13820)	5 years ago
email_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
feed_cleanup_scheduler.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
instance_refresh_scheduler.rb	Fix performance on instances list in admin UI (#15282)	4 years ago
ip_cleanup_scheduler.rb	Add IP-based rules (#14963)	4 years ago
media_cleanup_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
pghero_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
scheduled_statuses_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
trending_tags_scheduler.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
user_cleanup_scheduler.rb	Change account suspensions to be reversible by default (#14726)	4 years ago