From b564b879aabc27858915ad5476d0c361d39a2007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Wed, 5 Dec 2018 12:38:06 +0200
Subject: [PATCH] Update .mergify.yml - New syntax for mergify engine v. 2 -
 Relax review rules for trusted users

---
 .mergify.yml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 7195e58e..023bf59b 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,10 +1,16 @@
-rules:
-  default: null
-  branches:
-    master:
-      protection:
-        required_status_checks:
-          contexts:
-            - continuous-integration/travis-ci 
-        required_pull_request_reviews:
-          required_approving_review_count: 2
+pull_request_rules:
+  - name: Successful travis and 2 approved reviews
+    conditions:
+      - status-success=continuous-integration/travis-ci/pr
+      - "#approved-reviews-by>=2"
+    actions:
+      merge:
+        method: merge
+  - name: Trusted author, successful travis and 1 approved review
+    conditions:
+      - author~=(kaiyou|muhlemmer|mildred|HorayNarea|adi90x|hoellen|ofthesun9)
+      - status-success=continuous-integration/travis-ci/pr
+      - "#approved-reviews-by>=1"
+    actions:
+      merge:
+        method: merge