Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.		2023-02-03 19:23:27 +01:00
..
build-image.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-03 19:23:27 +01:00
check-i18n.yml	See version file in GitHub Actions (#21927)	2022-12-07 00:30:59 +01:00
codeql.yml	Run Prettier on YML files (#22345)	2022-12-16 11:11:52 +09:00
lint-css.yml	Separate Stylelint from Superlinter (#23303)	2023-01-30 00:23:52 +01:00
lint-js.yml	Separate ESLint CI from Superlinter (#23029)	2023-01-29 23:44:03 +01:00
lint-json.yml	Skip locales linting (#23352)	2023-02-01 15:15:11 +01:00
lint-ruby.yml	Filter Superlinter to Ruby files only (#21976)	2023-01-30 00:39:31 +01:00
lint-yml.yml	Skip locales linting (#23352)	2023-02-01 15:15:11 +01:00
rebase-needed.yml	Add CI job to label PRs with merge conflicts (#22020)	2022-12-09 06:37:13 +01:00