Merge branch 'master' into release/1.12.1

Author: valentijnscholten

.github/workflows/detect-merge-conflicts.yaml

@@ -0,0 +1,23 @@
+name: "Detect Merge Conflicts"
+on:
+  workflow_dispatch:
+  push:
+    branch:
+      - dev
+      - master
+      - release/*
+      
+  pull_request_target:
+    types: [synchronize]
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: check if prs are conflicted
+        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        with:
+          dirtyLabel: "conflicts-detected"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
+          commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."

.github/workflows/new-release-pr.yml

@@ -19,11 +19,11 @@ jobs:
   create_pr:
     runs-on: ubuntu-latest
     steps:
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+#       - name: Login to DockerHub
+#         uses: docker/login-action@v1
+#         with:
+#           username: ${{ secrets.DOCKERHUB_USERNAME }}
+#           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Checkout from_branch branch
         uses: actions/checkout@v2
         with: