Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2022-06-28 11:11:18 +02:00
..
assets.rake
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	Fix light-mode emoji borders. (#18131)	2022-04-29 19:23:03 +02:00
glitchsoc.rake
mastodon.rake	Fix redis configuration not being changed by mastodon:setup (#18383)	2022-05-09 23:19:11 +02:00
repo.rake	Remove language detection through cld3 (#17478)	2022-02-08 02:41:17 +01:00
statistics.rake
tests.rake	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00