diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-02-03 19:07:58 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2023-02-03 19:23:27 +0100 |
commit | aeacebb3d75112d0d22b9829813c388eef6ce5af (patch) | |
tree | 98fced042da7c37db7b401eb197cc44c7aa1a41c /.github/workflows/lint-yml.yml | |
parent | ec26f7c1b16ca1429991212292e35e520c617485 (diff) | |
parent | 79ca19e9b2e701d98c80afd939a98c2a3ef74830 (diff) |
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.
Diffstat (limited to '.github/workflows/lint-yml.yml')
-rw-r--r-- | .github/workflows/lint-yml.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.github/workflows/lint-yml.yml b/.github/workflows/lint-yml.yml index b939ec8ce..48f8170b3 100644 --- a/.github/workflows/lint-yml.yml +++ b/.github/workflows/lint-yml.yml @@ -10,6 +10,7 @@ on: - '**/*.yaml' - '**/*.yml' - '.github/workflows/lint-yml.yml' + - '!config/locales/*.yml' pull_request: paths: @@ -19,6 +20,7 @@ on: - '**/*.yaml' - '**/*.yml' - '.github/workflows/lint-yml.yml' + - '!config/locales/*.yml' jobs: lint: |