Merge pull request #18319 from grpc/vjpai-patch-2

Prevent merging if PR labeled DO NOT MERGE
6 years ago · d3f152f79a
parent d9f3de9d9a 9f9c03d0f5
commit d3f152f79a
1 changed files with 14 additions and 10 deletions
--- a/.github/mergeable.yml
+++ b/.github/mergeable.yml
@ -1,7 +1,11 @@
 mergeable:
  pull_requests:
    label:
-      or:
+      and:
        - must_exclude:
            regex: '^disposition/DO NOT MERGE'
            message: 'Pull request marked not mergeable'
        - or:
          - and:
            - must_include:
                regex: 'release notes: yes'