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 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.		2 years ago
..
assets.rake	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
auto_annotate_models.rake	Add announcements (#12662)	5 years ago
branding.rake	Apply Rubocop Rails/RootPublicPath (#23447)	2 years ago
db.rake	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
emojis.rake	Apply Rubocop Rails/RootPublicPath (#23447)	2 years ago
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	7 years ago
mastodon.rake	Autofix Rubocop Style/StringLiterals (#23695)	2 years ago
repo.rake	Remove language detection through cld3 (#17478)	3 years ago
statistics.rake	Apply Rubocop Style/RedundantConstantBase (#23463)	2 years ago
tests.rake	Fix pre-4.0 admin action logs (#22091)	2 years ago