Revert "removed the hotfix condition"

This reverts commit 9ff832f.
Parabeac · Oct 5, 2020 · 4bb5018 · 4bb5018
1 parent 5f9f91a
commit 4bb5018
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -13,4 +13,18 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - dev
+          - dev
+  - name: Automatic merge on approval
+    conditions:
+      - "#approved-reviews-by>=2"
+      - "-head~=^hotfix"
+    actions:
+      merge:
+        method: squash
+  - name: Wrong branch
+    conditions:
+      - "-head~=^hotfix"
+      - "base=stable"
+    actions:
+      close:
+        message: "Thank you for your contribution @{{author}}🎉! However, please double check if this PR goes into dev and not stable 🤔. The PR is going to be closed, please make another PR for dev!"