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
..
build-image.yml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
check-i18n.yml	Check for missing i18n strings in CI (#23368)	2 years ago
codeql.yml	Run Prettier on YML files (#22345)	2 years ago
lint-css.yml	Trigger CI build on .nvmrc change (#23627)	2 years ago
lint-js.yml	Trigger CI build on .nvmrc change (#23627)	2 years ago
lint-json.yml	Trigger CI build on .nvmrc change (#23627)	2 years ago
lint-ruby.yml	Run bundler-audit on PRs (#23514)	2 years ago
lint-yml.yml	Trigger CI build on .nvmrc change (#23627)	2 years ago
rebase-needed.yml	Set CI concurrency at the job level (#23689)	2 years ago
test-js.yml	Move Jest tests to filtered GitHub Action (#23623)	2 years ago
test-migrations-one-step.yml	Move db migration CI to GitHub Actions (#23624)	2 years ago
test-migrations-two-step.yml	Move db migration CI to GitHub Actions (#23624)	2 years ago