Merge pull request #11039 from geekosaur/mergify-wrong-queue

adjust Mergify queue rules for release branches

Author: mergify[bot]

.github/mergify.yml

@@ -11,20 +11,20 @@ priority_rules:
   - name: priority for queue `default`
     conditions:
       - queue-name=default
-    priority: 2750
+    priority: 2500
 
   - name: priority for queue `squash-merge`
     conditions:
       - queue-name=squash-merge
-    priority: 2750
+    priority: 2500
 
   # The idea is we slightly prioritize those PRs because we're in
   # a release cycle if a PR matches.
   - name: release branch
     conditions:
       - 'base~=^3\.'
       - 'label!=backport'
-    priority: 2800
+    priority: 2750
 
 pull_request_rules:
 
@@ -142,7 +142,7 @@ pull_request_rules:
     conditions:
       - label=merge me
       - base!=master
-      - -body~=backport
+      - -label=backport
       - '#approved-reviews-by>=2'
       - '-label~=^blocked:'
 
@@ -154,7 +154,7 @@ pull_request_rules:
     conditions:
       - base!=master
       - label=squash+merge me
-      - -body~=backport
+      - -label=backport
       - '#approved-reviews-by>=2'
       - '-label~=^blocked:'
 
@@ -166,7 +166,7 @@ pull_request_rules:
     conditions:
       - label=merge me
       - base!=master
-      - body~=backport
+      - label=backport
       - '#approved-reviews-by>=1'
       - '-label~=^blocked:'
 
@@ -178,7 +178,7 @@ pull_request_rules:
     conditions:
       - label=squash+merge me
       - base!=master
-      - body~=backport
+      - label=backport
       - '#approved-reviews-by>=1'
       - '-label~=^blocked:'