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
..
assets.rake	…
auto_annotate_models.rake	…
db.rake	Fix post-migration warning about index corruption being too scary (#15223)	4 years ago
emojis.rake	Add border around 🕺 emoji (#14769)	4 years ago
glitchsoc.rake	…
mastodon.rake	Fix external user creation failing when invite request text is required (#15405)	4 years ago
repo.rake	…
statistics.rake	…