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
..
assets.rake	Override current_user when generating static pages	2018-12-19 20:49:58 +01:00
auto_annotate_models.rake	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
db.rake	Fix post-migration warning about index corruption being too scary (#15223)	2020-11-27 15:41:43 +01:00
emojis.rake	Add border around 🕺 emoji (#14769)	2020-09-10 19:08:03 +02:00
glitchsoc.rake
mastodon.rake	Fix external user creation failing when invite request text is required (#15405)	2020-12-22 17:14:32 +01:00
repo.rake	Add missing locale file for ga and add rake task to check for it (#11813)	2019-09-12 04:58:33 +02:00
statistics.rake