Merge branch 'master' into action-fix-docs

Author: koaning

.github/workflows/automatic-pr-merger.yml

@@ -0,0 +1,25 @@
+name: Automatic PR Merger
+
+on:
+  push: {} # update PR when base branch is updated
+  status: {} # try to merge when other checks are completed
+  pull_request_review: # try to merge after review
+    types:
+      - submitted
+      - edited
+      - dismissed
+  pull_request: # try to merge if labels have changed (white/black list)
+    types:
+      - labeled
+      - unlabeled
+
+jobs:
+  # thats's all. single step is needed - if PR is mergeable according to
+  # branch protection rules it will be merged automatically
+  mergepal:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: rasahq/[email protected]
+        with:
+          token: ${{ secrets.RASABOT_AUTOMERGE_GITHUB_TOKEN }}

.github/workflows/continous-integration.yml

@@ -261,3 +261,12 @@ jobs:
         pip install -U github3.py pypandoc
         python3 scripts/publish_gh_release_notes.py
         ./scripts/ping_slack_about_package_release.sh
+
+  mergepal-merge: # run merge pal in the end
+    runs-on: ubuntu-latest
+    needs: [quality, test, api, docker]
+    steps:
+      - uses: actions/checkout@v1
+      - uses: rasahq/[email protected]
+        with:
+          token: ${{ secrets.RASABOT_AUTOMERGE_GITHUB_TOKEN }}

.mergepal.yml

@@ -0,0 +1,3 @@
+whitelist:
+  - status:ready-to-merge
+method: merge