From a565e0117f8bdf6c7a26906e0859a0034d510d59 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:19:24 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 8396cecd..317737be 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,26 +1,28 @@
 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 for leadership team members when
+      there are no reviewers
+    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:
       - "#review-requested=0"
       - base=main
       - author=@leadership
       - label=ready_for_merge
+    merge_conditions: []
+    merge_method: merge
+    method: merge
+  - name: default
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - base=main
+    merge_conditions:
+      - base=main
+    merge_method: merge
+
+pull_request_rules:
+  - name: refactored queue action rule
+    conditions: []
     actions:
       queue:
-        method: merge
-        name: default