From bf2386cd9220918ace460b8210a5a9c1e0ec0bc3 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 16:11:08 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

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

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 6725314..d0c633e 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,14 +1,6 @@
 queue_rules:
   - name: default
-    conditions:
-      # Conditions to get out of the queue (= merged)
-      - check-success=DCO
-      - check-success=docker-images
-      - check-success=validation
-
-pull_request_rules:
-  - name: Automatic merge on approval
-    conditions:
+    queue_conditions:
       - base=main
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
@@ -18,11 +10,19 @@ pull_request_rules:
       - check-success=validation
       - label!=do-not-merge
       - label=ready-to-merge
+    merge_conditions:
+      # Conditions to get out of the queue (= merged)
+      - check-success=DCO
+      - check-success=docker-images
+      - check-success=validation
+    merge_method: merge
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+
+pull_request_rules:
+  - name: refactored queue action rule
+    conditions: []
     actions:
       queue:
-        method: merge
-        name: default
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-
-          {{ body }}