From 6abfa2de607eff70c0b36354ea853dec5b4ce0d7 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 08:33:08 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

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

diff --git a/.mergify.yml b/.mergify.yml
index 4bbb32d0f0..47576268d7 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,21 +1,17 @@
 queue_rules:
   - name: default
-    conditions:
-      - "#approved-reviews-by>1"
-
-pull_request_rules:
-  - name: automerge to main with label automerge and branch protection passing
-    conditions:
+    queue_conditions:
       - "#approved-reviews-by>1"
       - base=main
       - label=automerge
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
+    merge_conditions:
+      - "#approved-reviews-by>1"
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body }}
+    merge_method: squash
+
+pull_request_rules:
   - name: backport patches to v0.49.x branch
     conditions:
       - base=main
@@ -40,3 +36,7 @@ pull_request_rules:
       backport:
         branches:
           - release/v0.47.x
+  - name: automerge to main with label automerge and branch protection passing
+    conditions: []
+    actions:
+      queue: