From 361957c66b49359a2d0a69d4f86f4c2ac972f2b4 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 18:48:28 -0500
Subject: [PATCH] chore(mergify): upgrade configuration to current format
 (#3752)

Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com>
---
 .mergify.yml | 80 +++++++++++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 0486ee8ad1..b98f7c2845 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,41 +1,45 @@
 queue_rules:
-    - name: default
-      conditions:
-          - status-success="Validate"
-          - status-success=license/cla
-          - status-success=lint_test_build
+  - name: Automatic boxmoji merge
+    queue_conditions:
+      - author=boxmoji
+      - base=master
+      - files~=^i18n/
+      - status-success="Validate"
+      - status-success=lint_test_build
+      - title~=^(fix)\(i18n\)?:\supdate translations$
+    merge_conditions:
+      - status-success="Validate"
+      - status-success=lint_test_build
+    merge_method: squash
+  - name: Automatic strict merge
+    queue_conditions:
+      - base=master
+      - "#approved-reviews-by>=2"
+      - "#changes-requested-reviews-by=0"
+      - "#review-requested=0"
+      - status-success="Validate"
+      - status-success=license/cla
+      - status-success=lint_test_build
+      - label=ready-to-merge
+      - label!=do-not-merge
+      - title~=^(build|ci|chore|docs|feat|fix|perf|refactor|revert|style|test)(\([^)]+\))?:\s.+$
+    merge_conditions:
+      - status-success="Validate"
+      - status-success=license/cla
+      - status-success=lint_test_build
+    merge_method: squash
+  - name: default
+    queue_conditions:
+      - status-success="Validate"
+      - status-success=license/cla
+      - status-success=lint_test_build
+    merge_conditions:
+      - status-success="Validate"
+      - status-success=license/cla
+      - status-success=lint_test_build
 
 pull_request_rules:
-    - name: Automatic boxmoji merge
-      conditions:
-          - author=boxmoji
-          - base=master
-          - files~=^i18n/
-          - status-success="Validate"
-          - status-success=license/cla
-          - status-success=lint_test_build
-          - title~=^(fix)\(i18n\)?:\supdate translations$
-      actions:
-          queue:
-              method: squash
-              name: default
-    - name: Automatic strict merge
-      conditions:
-          - base=master
-          - "#approved-reviews-by>=2"
-          - "#changes-requested-reviews-by=0"
-          - "#review-requested=0"
-          - status-success="Validate"
-          - status-success=license/cla
-          - status-success=lint_test_build
-          - label=ready-to-merge
-          - label!=do-not-merge
-          - title~=^(build|ci|chore|docs|feat|fix|perf|refactor|revert|style|test)(\([^)]+\))?:\s.+$
-      actions:
-          queue:
-              method: squash
-              name: default
-    - name: Automatic head deletion
-      conditions: []
-      actions:
-          delete_head_branch: {}
+  - name: Automatic merge
+    conditions: []
+    actions:
+      queue: