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

---
 .mergify.yml | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index fa4589d72..b5c35a070 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,30 +1,17 @@
 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"
       - -draft
       - base=main
-    actions:
-      queue:
-        method: merge
-        name: default
-        
-pull_request_rules:
-  - name: Automatic merge for leadership team members when there are no reviewers and the label is "ready"
-    conditions:
-      - "#review-requested=0"
-      - "#changes-requested-reviews-by<1"
-      - -draft
+    merge_conditions:
+      - -draft # not a draft
       - base=main
-      - author=@leadership
-      - label=ready
+    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