For #2778 - Mergify change deprecated strict (#2827)

mozilla-mobile · Nov 17, 2021 · 589ca70 · 589ca70
1 parent 45f0281
commit 589ca70
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -18,9 +18,9 @@ pull_request_rules:
       - label!=Work In Progress
       - label!=Do Not Land
     actions:
-      merge:
+      queue:
         method: rebase
-        strict: smart
+        name: default
   - name: Needs landing - Squash
     conditions:
       - label=Needs Landing (Squash)
@@ -29,9 +29,9 @@ pull_request_rules:
       - label!=work in progress
       - label!=do not land
     actions:
-      merge:
+      queue:
         method: squash
-        strict: smart
+        name: default
   - name: String Import - Auto Approve
     conditions:
       - author=github-actions[bot]