Skip to content

Commit 7182c61

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent a9a6edc commit 7182c61

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

.mergify.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ merge_queue:
1818

1919
queue_rules:
2020
- name: single-commit
21-
autoqueue: true
2221
batch_size: 1
2322
merge_method: rebase
2423
queue_conditions: &single_commit_conditions
@@ -44,7 +43,6 @@ queue_rules:
4443
merge_conditions: *single_commit_conditions
4544

4645
- name: multi-commit
47-
autoqueue: true
4846
batch_size: 1
4947
merge_method: squash
5048
queue_conditions: &multi_commit_conditions
@@ -77,3 +75,6 @@ pull_request_rules:
7775
actions:
7876
comment:
7977
message: "@{{author}} This pull request has conflicts with the target branch. Please resolve them and update the branch before merging."
78+
merge_protections_settings:
79+
auto_merge_conditions: true
80+
reporting_method: check-runs

0 commit comments

Comments
 (0)