Claire 3e63fcd4f0 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.		2023-01-12 10:15:46 +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
branding.rake	Fix wrong aspect ratio of logo in icons (#18639)	2022-06-11 20:32:02 +02:00
db.rake	Fix null values being included in some indexes (#17711)	2022-03-12 08:12:57 +01:00
emojis.rake	Add assets from Twemoji 14.0 (#19733)	2022-11-04 16:08:41 +01:00
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	2017-12-10 22:49:59 -06:00
mastodon.rake	Fix $ not being escaped in .env.production file generated by mastodon:setup (#23012)	2023-01-11 21:53:11 +01:00
repo.rake	Remove language detection through cld3 (#17478)	2022-02-08 02:41:17 +01:00
statistics.rake	add task to report code statistics (#2489)	2017-04-26 18:47:22 +02:00
tests.rake	Fix pre-4.0 admin action logs (#22091)	2022-12-06 23:38:03 +01:00