From 2d4844f97f804149aa6dd47bcf957c1de9eaf6ea Mon Sep 17 00:00:00 2001
From: "M. J. Fromberger" <fromberger@interchain.io>
Date: Mon, 6 Dec 2021 12:20:28 -0800
Subject: [PATCH] Update mergify configuration. (#7385)

Per https://blog.mergify.com/strict-mode-deprecation/, the strict mode
has been deprecated and will be turned off on 10-Jan-2022. This updates
the config to use the new, approved thing instead of the old thing.
---
 .github/mergify.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index d49264597..3ca448886 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,12 +1,18 @@
+queue_rules:
+  - name: default
+    conditions:
+      - base=master
+      - label=S:automerge
+
 pull_request_rules:
   - name: Automerge to master
     conditions:
       - base=master
       - label=S:automerge
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart+fasttrack
+        name: default
         commit_message: title+body
   - name: backport patches to v0.34.x branch
     conditions:
@@ -24,4 +30,3 @@ pull_request_rules:
       backport:
         branches:
           - v0.35.x
-