From 6ddbe7972da32133ebb71db58c0a35284651ee69 Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Wed, 2 Feb 2022 12:07:33 +1000
Subject: [PATCH] fix(mergify): put PRs with no priority label in the low
 priority queue (#3454)

This also lets us handle dependabot PRs using the low queue rule.
---
 .github/mergify.yml | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index b29901ca..50db77eb 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -64,25 +64,13 @@ pull_request_rules:
       - "#review-threads-unresolved=0"
       - -draft
       - base=main
-      - or:
-          - "label~=^P-Low"
-          - "label~=^P-Optional"
       - label!=do-not-merge
+      # This queue handles Low, Optional, and PRs with no priority label,
+      # including automated dependabot PRs.
+      #
+      # We don't need to check priority labels here, because the rules are evaluated in order:
+      # https://docs.mergify.com/configuration/#pull-request-rules
     actions:
       queue:
         name: low
         method: squash
-
-  - name: automatic merge for Dependabot pull requests
-    conditions:
-      - "#approved-reviews-by>=1"
-      - "#review-threads-unresolved=0"
-      - author~=^dependabot(|-preview)\[bot\]$
-      - check-success=Test (+stable) on ubuntu-latest
-      - check-success=Test (+stable) on macOS-latest
-      - check-success=Test (+stable) on windows-latest
-      - check-success=pull-request (zealous-zebra)
-      - check-success=Coverage (+nightly)
-    actions:
-      merge:
-        method: squash