Claire 5f26e6e7ca Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.		2023-02-09 12:46:12 +01:00
..
assets.rake	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-09 12:46:12 +01:00
auto_annotate_models.rake	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
branding.rake	Apply Rubocop Rails/RootPublicPath (#23447)	2023-02-08 10:38:07 +01:00
db.rake	Fix null values being included in some indexes (#17711)	2022-03-12 08:12:57 +01:00
emojis.rake	Apply Rubocop Rails/RootPublicPath (#23447)	2023-02-08 10:38:07 +01:00
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	2017-12-10 22:49:59 -06:00
mastodon.rake	Apply Rubocop Style/NegatedIfElseCondition (#23451)	2023-02-08 07:07:36 +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