diff --git a/.github/mergify.yml b/.github/mergify.yml index 37b6d50a0..72f91e244 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -23,22 +23,20 @@ shared: queue_rules: - name: default - conditions: + queue_conditions: - and: *compulsory - -pull_request_rules: - - name: Automatic merge - conditions: + - label=ready-to-merge + merge_conditions: - and: *compulsory - # Ensure the review is opted in using labels. - - label=ready-to-merge + merge_method: merge + commit_message_template: | + {{ title }} (#{{ number }}) + {{ body }} + +pull_request_rules: + - name: refactored queue action rule + conditions: [] actions: queue: - name: default - method: merge - commit_message_template: | - {{ title }} (#{{ number }}) - - {{ body }}