diff --git a/.github/mergify.yml b/.github/mergify.yml index 4d3b6adae6d..053873fbdbc 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -2,9 +2,13 @@ queue_rules: - name: default checks_timeout: 2 h branch_protection_injection_mode: queue + merge_method: squash conditions: - base=main - label=ci:ready_to_merge + commit_message_template: | + {{ title }} (#{{ number }}) + {{ body_raw }} pull_request_rules: @@ -15,10 +19,6 @@ pull_request_rules: actions: queue: name: default - method: squash - commit_message_template: | - {{ title }} (#{{ number }}) - {{ body_raw }} - name: remove ci:ready_to_merge label conditions: