From 10175b91b6b8c2c3ecdcb22d6d844748f9fcc516 Mon Sep 17 00:00:00 2001
From: Damian Nolan <damiannolan@gmail.com>
Date: Thu, 10 Oct 2024 17:36:37 +0200
Subject: [PATCH] ci: mergify updates (#7439)

---
 .github/mergify.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index a39fae4d878..d8bb1105e59 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,6 +1,9 @@
 queue_rules:
   - name: default
-    conditions:
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body }}
+    merge_conditions:
       - "#approved-reviews-by>=1"
       - base=main
       - label=automerge
@@ -14,10 +17,7 @@ pull_request_rules:
     actions:
       queue:
         name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
+        merge_method: squash
   - name: backport patches to v0.1.x callbacks ibc-go v7.3.x branch
     conditions:
       - base=main