Merge pull request #722 from usrpro/update-mergify

Update .mergify.yml

.mergify.yml

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