From dfd5bae78495cec375bcb249360a1e01d817dc24 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 6 Dec 2021 12:43:01 -0800
Subject: [PATCH] Update mergify configuration. (backport #7385) (#7386)

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.

(cherry picked from commit 2d4844f97f804149aa6dd47bcf957c1de9eaf6ea)
---
 .github/mergify.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/mergify.yml

diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 000000000..9ec7e1638
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,16 @@
+queue_rules:
+  - name: default
+    conditions:
+      - base=v0.34.x
+      - label=S:automerge
+
+pull_request_rules:
+  - name: Automerge to v0.34.x
+    conditions:
+      - base=v0.34.x
+      - label=S:automerge
+    actions:
+      queue:
+        method: squash
+        name: default
+        commit_message: title+body