Mergify aligment (#530)

Mergify aligment
playframework · Dec 19, 2019 · 9a49c30 · 9a49c30
2 parents d5af795 + 195b39f
commit 9a49c30
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -10,8 +10,18 @@ pull_request_rules:
       - label!=status:block-merge
     actions:
       merge:
-        method: squash
-        strict: smart
+        method: merge
+
+  - name: Merge ScalaSteward's PRs that are ready
+    conditions:
+      - author=scala-steward
+      - status-success=Travis CI - Pull Request
+      - "#review-requested=0"
+      - "#changes-requested-reviews-by=0"
+      - label!=status:block-merge
+    actions:
+      merge:
+        method: merge
 
   - name: Delete the PR branch after merge
     conditions: