Merge branch 'master' into prepare-libp2p-webrtc-websys-non-alpha

libp2p · Jan 13, 2025 · e6af714 · e6af714
2 parents 27f755e + d57081f
commit e6af714
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -19,6 +19,8 @@ pull_request_rules:
       - label=send-it
       - author!=@libp2p/rust-libp2p-maintainers
       - author!=dependabot[bot]
+      # Do not remove approvals if last commit was a merge of master into the branch, required for the PR to be merged.
+      - commits[-1].author!=@libp2p/rust-libp2p-maintainers
     actions:
       dismiss_reviews:
         message: Approvals have been dismissed because the PR was updated after the
@@ -61,9 +63,8 @@ pull_request_rules:
       queue:
 
 queue_rules:
-  - name: default merge queue
+  - name: default
     queue_conditions:
-      - label=send-it
       - base=master
     merge_conditions: []
     merge_method: squash