From f27254dd63233c0e76e75135d1d15f4aa99ea429 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:58:57 +0000
Subject: [PATCH] mergify: replace queue action for queue_rules (#14044)
 (#14045)

(cherry picked from commit f0856322c06ced6109582983b64307ea6b9862ec)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
---
 .mergify.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index a4e943372bd..a62731c17d1 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,5 +1,6 @@
 queue_rules:
   - name: default
+    merge_method: squash
     conditions:
       - check-success=test (macos-latest)
       - check-success=test (windows-latest)
@@ -150,7 +151,6 @@ pull_request_rules:
       - -conflict
     actions:
       queue:
-        method: squash
         name: default
   - name: delete updatecli branch after merging/closing it
     conditions:
@@ -204,7 +204,6 @@ pull_request_rules:
       - -conflict
     actions:
       queue:
-        method: squash
         name: default
   - name: backport patches to 8.5 branch
     conditions: