From f7626713e1f6a3e85b09b35ddd9fe59b1a6dfcbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Jun 2021 04:25:42 +0000 Subject: [PATCH 1/2] Bump django from 2.2.23 to 2.2.24 Bumps [django](https://github.com/django/django) from 2.2.23 to 2.2.24. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/2.2.23...2.2.24) --- updated-dependencies: - dependency-name: django dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fc0c49f..a398b94 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ coverage==5.5 -Django==2.2.23 +Django==2.2.24 django-debug-toolbar==3.2.1 docutils==0.17.1 freezegun==1.1.0 From 9943bdefb54be7c0b29acc8a4e8d82d83d4cf0ce Mon Sep 17 00:00:00 2001 From: ckleemann Date: Mon, 7 Jun 2021 10:57:05 +0200 Subject: [PATCH 2/2] remove not working auto merge --- .github/workflows/auto-merge.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .github/workflows/auto-merge.yml diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml deleted file mode 100644 index 7d75db6..0000000 --- a/.github/workflows/auto-merge.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: auto-merge - -on: - pull_request: - -jobs: - auto-merge: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: ahmadnassri/action-dependabot-auto-merge@v2 - with: - github-token: ${{ secrets.mytoken }}