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

---
 .mergify.yml | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 8396cecdd..60e1f4d75 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,26 +1,30 @@
 queue_rules:
-  - name: default
-    conditions:
-      - base=main
-
-pull_request_rules:
-  - name: Automatic merge on approval and when GitHub branch protection passes on main
-    conditions:
+  - name: duplicated default from Automatic merge on approval and when GitHub branch
+      protection passes on main
+    queue_conditions:
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
       - base=main
-    actions:
-      queue:
-        method: merge
-        name: default
-
-  - name: Automatic merge for leadership team members when there are no reviewers
-    conditions:
+    merge_conditions:
+      - base=main
+    merge_method: merge
+  - name: duplicated default from Automatic merge for leadership team members when
+      there are no reviewers
+    queue_conditions:
       - "#review-requested=0"
       - base=main
       - author=@leadership
       - label=ready_for_merge
+    merge_conditions:
+      - base=main
+    merge_method: merge
+  - name: default
+    conditions:
+      - base=main
+
+pull_request_rules:
+  - name: Automatic merge for leadership team members when there are no reviewers
+      + Automatic merge on approval and when GitHub branch protection passes on main
+    conditions: []
     actions:
       queue:
-        method: merge
-        name: default