From fd7060f111a5aeb6b142060a920f7abe889c5df0 Mon Sep 17 00:00:00 2001
From: Albert Magyar
Date: Mon, 18 Nov 2019 17:32:13 -0800
Subject: [Mergify] Automatically merge backport PRs when ready

---
 .mergify.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index 1dd36b18..9b1328ba 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -39,3 +39,18 @@ pull_request_rules:
     actions:
       label:
         add: [Backport]
+
+  - name: automatic squash-and-merge of backport PRs
+    conditions:
+      - status-success=continuous-integration/travis-ci/pr
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - base=1.2.x
+      - label="Please Merge"
+      - label="Backport"
+      - label!="DO NOT MERGE"
+    actions:
+      merge:
+        method: squash
+        strict: smart
+        strict_method: merge
-- 
cgit v1.2.3


From 9edbfa9d0395d847e90457114c93efc5a95c8878 Mon Sep 17 00:00:00 2001
From: Albert Magyar
Date: Mon, 18 Nov 2019 18:59:26 -0800
Subject: [Mergify] Drop review requirement for backport PRs

---
 .mergify.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 9b1328ba..f16d1871 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -43,10 +43,8 @@ pull_request_rules:
   - name: automatic squash-and-merge of backport PRs
     conditions:
       - status-success=continuous-integration/travis-ci/pr
-      - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
       - base=1.2.x
-      - label="Please Merge"
       - label="Backport"
       - label!="DO NOT MERGE"
     actions:
-- 
cgit v1.2.3