From cfa9ed84a1ce299f5e1069df11ed50e38d568878 Mon Sep 17 00:00:00 2001
From: David <david.sato64@gmail.com>
Date: Mon, 6 Dec 2021 11:30:05 +0100
Subject: [PATCH] ci(Mergify): configuration update

Signed-off-by: David <null>
---
 .mergify.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index ef80e1752..573464a46 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,3 +1,9 @@
+queue_rules:
+  - name: default
+    conditions:
+      - check-success=Deploy
+      - check-success=Cypress
+
 pull_request_rules:
   - name: Merge approved and green PRs when tagged with 'Auto-merge'
     conditions:
@@ -6,10 +12,11 @@ pull_request_rules:
       - check-success=Deploy
       - check-success=Cypress
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart+fasttrack
+        name: default
         commit_message: title+body
+  # DEPENDABOT PRs
   - name: automatic merge for Dependabot pull requests
     conditions:
       - author~=^dependabot(|-preview)\[bot\]$
@@ -18,7 +25,7 @@ pull_request_rules:
       - check-success=Deploy
       - base=develop
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart+fasttrack
+        name: default
         commit_message: title+body