From 6d0e1bc504359cbaafbc6bb733c6b117e7318034 Mon Sep 17 00:00:00 2001
From: Chris Rybicki <chrisr@wing.cloud>
Date: Tue, 24 Sep 2024 16:55:39 -0400
Subject: [PATCH] chore: fix mergify config (#7167)

---
 .mergify.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 433aa10c071..530fa5fc7e3 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -2,6 +2,10 @@
 queue_rules:
   - name: default
     speculative_checks: 2
+    merge_method: squash
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+      {{ body }}
 
 pull_request_rules:
   - name: automatic merge
@@ -11,10 +15,6 @@ pull_request_rules:
           Thanks for contributing, @{{author}}! This PR will now be added to the [merge queue](https://mergify.com/merge-queue), or immediately merged if `{{head}}` is up-to-date with `{{base}}` and the queue is empty.
       queue:
         name: default
-        merge_method: squash
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-          {{ body }}
     conditions:
       - -files=.mergify.yml
       - -title~=(?i)wip