From 2be6f576c7ec68f7c4d6c5a4c4a40d3640844ea6 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2024 02:26:39 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 88f91733..7e03ff32 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,18 +1,19 @@
 queue_rules:
   - name: default
-    conditions:
-      - -draft # not a draft
-      - base=main
-
-pull_request_rules:
-  - name: Automatic merge on approval and when when GitHub branch protection passes on main
-    conditions:
+    queue_conditions:
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by<1"
       - -draft
       - base=main
       - label!=dependencies
+    merge_conditions:
+      - -draft # not a draft
+      - base=main
+    merge_method: merge
+
+pull_request_rules:
+  - name: Automatic merge on approval and when when GitHub branch protection passes
+      on main
+    conditions: []
     actions:
       queue:
-        method: merge
-        name: default