Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.		2023-07-17 19:02:23 +02:00
..
build-image.yml	Fixes latest Docker tag (#25812)	2023-07-11 14:52:00 +02:00
build-nightly.yml	Fixed mastodon version injection into containers via github actions (#24873)	2023-05-05 18:58:35 +02:00
bundler-audit.yml	Run brakeman in GitHub Actions (#23713)	2023-07-11 15:23:57 +02:00
check-i18n.yml	Upgrade react-intl (#24906)	2023-05-31 23:43:39 +02:00
codeql.yml	Run Prettier on YML files (#22345)	2022-12-16 11:11:52 +09:00
haml-lint-problem-matcher.json	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00
lint-css.yml	Configure Renovate (#25255)	2023-06-06 10:42:23 +02:00
lint-haml.yml	Configure Renovate (#25255)	2023-06-06 10:42:23 +02:00
lint-js.yml	Configure Renovate (#25255)	2023-06-06 10:42:23 +02:00
lint-json.yml	Configure Renovate (#25255)	2023-06-06 10:42:23 +02:00
lint-md.yml	Configure Renovate (#25255)	2023-06-06 10:42:23 +02:00
lint-ruby.yml	Run brakeman in GitHub Actions (#23713)	2023-07-11 15:23:57 +02:00
lint-yml.yml	Configure Renovate (#25255)	2023-06-06 10:42:23 +02:00
rebase-needed.yml	Increase PR Rebase job retries (#25926)	2023-07-17 16:10:43 +02:00
test-js.yml	Configure Renovate (#25255)	2023-06-06 10:42:23 +02:00
test-migrations-one-step.yml	Configure Renovate (#25255)	2023-06-06 10:42:23 +02:00
test-migrations-two-step.yml	Configure Renovate (#25255)	2023-06-06 10:42:23 +02:00
test-ruby.yml	Configure Renovate (#25255)	2023-06-06 10:42:23 +02:00