From 195b39f2a493884bf3678208dad05faf845a82a3 Mon Sep 17 00:00:00 2001
From: Renato Cavalcanti <renato@cavalcanti.be>
Date: Thu, 19 Dec 2019 21:21:59 +0100
Subject: [PATCH] Mergify aligment

* use merge
* remove 'smart' merge
* add rule for scala-steward
---
 .mergify.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index dabb7f93..a6e23f77 100644
--- 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: