Commit c79558b3 authored by Matthew Slipper's avatar Matthew Slipper Committed by GitHub

Merge pull request #2469 from mslipper/bugfix/mergify-dnm

ci: Fix mergify config
parents 55dc75db a436d486
...@@ -5,12 +5,11 @@ queue_rules: ...@@ -5,12 +5,11 @@ queue_rules:
pull_request_rules: pull_request_rules:
- name: Automatic merge on approval - name: Automatic merge on approval
conditions: conditions:
and:
- "label!=do-not-merge"
- and: - and:
- "#review-threads-unresolved=0" - "#review-threads-unresolved=0"
- "#approved-reviews-by>=2" - "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0" - "#changes-requested-reviews-by=0"
- "label!=do-not-merge"
- or: - or:
- and: - and:
- "label!=SR-Risk" - "label!=SR-Risk"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment