Merge pull request #404 from ignasi35/fix-mergify

Sync mergify config with play itself

Author: octonato

.mergify.yml

@@ -7,16 +7,18 @@ pull_request_rules:
       - "#review-requested=0"
       - "#changes-requested-reviews-by=0"
       - label!=status:block-merge
+      - label=status:merge-when-green
     actions:
       merge:
         method: merge
-        strict: smart
 
   - name: Delete the PR branch after merge
     conditions:
       - merged
     actions:
       delete_head_branch: {}
+      label:
+        remove: [ "status:merge-when-green" ]
 
   - name: auto add wip
     conditions:
@@ -25,3 +27,10 @@ pull_request_rules:
     actions:
       label:
         add: ["status:block-merge"]
+
+  - name: Labeling for Scala Steward PR's
+    conditions:
+      - author=scala-steward
+    actions:
+      label:
+        add: [ "type:updates" ]