Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.		2023-02-19 10:42:55 +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	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
emojis.rake	Apply Rubocop Rails/RootPublicPath (#23447)	2023-02-08 10:38:07 +01:00
glitchsoc.rake
mastodon.rake	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
repo.rake	Remove language detection through cld3 (#17478)	2022-02-08 02:41:17 +01:00
statistics.rake	Apply Rubocop Style/RedundantConstantBase (#23463)	2023-02-18 04:30:03 +01:00
tests.rake	Fix pre-4.0 admin action logs (#22091)	2022-12-06 23:38:03 +01:00