From cb2d4916c3af68013dec5c3d4336fc3e14447ca1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 15:25:58 +0000 Subject: [PATCH 1/2] Bump mschilde/auto-label-merge-conflicts Bumps [mschilde/auto-label-merge-conflicts](https://github.com/mschilde/auto-label-merge-conflicts) from 8c6faa8a252e35ba5e15703b3d747bf726cdb95c to 591722e97f3c4142df3eca156ed0dcf2bcd362bd. - [Release notes](https://github.com/mschilde/auto-label-merge-conflicts/releases) - [Commits](https://github.com/mschilde/auto-label-merge-conflicts/compare/8c6faa8a252e35ba5e15703b3d747bf726cdb95c...591722e97f3c4142df3eca156ed0dcf2bcd362bd) --- updated-dependencies: - dependency-name: mschilde/auto-label-merge-conflicts dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/label-conflicts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label-conflicts.yml b/.github/workflows/label-conflicts.yml index f0ce1cf..cab0645 100644 --- a/.github/workflows/label-conflicts.yml +++ b/.github/workflows/label-conflicts.yml @@ -14,7 +14,7 @@ jobs: triage-conflicts: runs-on: ubuntu-latest steps: - - uses: mschilde/auto-label-merge-conflicts@8c6faa8a252e35ba5e15703b3d747bf726cdb95c # Oct 25, 2021 + - uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # Oct 25, 2021 with: CONFLICT_LABEL_NAME: "has conflicts" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 09b3b8299d31a7425c6a67d32c55a7a54e0b92c3 Mon Sep 17 00:00:00 2001 From: Jirka Borovec <6035284+Borda@users.noreply.github.com> Date: Wed, 14 Feb 2024 14:18:10 +0100 Subject: [PATCH 2/2] Apply suggestions from code review --- .github/workflows/label-conflicts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label-conflicts.yml b/.github/workflows/label-conflicts.yml index cab0645..a02122d 100644 --- a/.github/workflows/label-conflicts.yml +++ b/.github/workflows/label-conflicts.yml @@ -14,7 +14,7 @@ jobs: triage-conflicts: runs-on: ubuntu-latest steps: - - uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # Oct 25, 2021 + - uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # Jul 20, 2023 with: CONFLICT_LABEL_NAME: "has conflicts" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}