Merge branch 'master' into is7095/toggle-vip-feature

Author: mergify[bot]

.github/mergify.yml

@@ -1,6 +1,7 @@
+# NOTE: the PR is added to the queue when all checks have passed
+# and the CI is fully grean and ready to be merged
 queue_rules:
   - name: default
-    branch_protection_injection_mode: merge
     queue_conditions:
       # general prerequisits fo accept the PR in the queue
       - label=🤖-automerge # let Mergify know that the PR can be merged (added manually)
@@ -20,10 +21,11 @@ queue_rules:
       - check-success=integration-tests
       - check-success=system-tests
 
+# NOTE: these rules help you to forget about the PR
+# and let mergify update it and deal with flaky tests
 pull_request_rules:
   - name: update branch if behind master
     conditions:
-      - queue-name=default # only run if already queued
       - label=🤖-automerge
       - label!=🤖-do-not-merge
       - base=master
@@ -32,7 +34,6 @@ pull_request_rules:
 
   - name: retry CI on fails (used for flaky tests)
     conditions:
-      - queue-name=default # only run if already queued
       - label=🤖-automerge
       - label!=🤖-do-not-merge
       - base=master