Skip to content

Commit 80ad645

Browse files
authored
mergify: replace queue action for queue_rules (#5517)
Force merging as tests won't pass before a 9.x release is available.
1 parent 976b647 commit 80ad645

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.mergify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
queue_rules:
22
- name: default
3+
merge_method: squash
34
conditions:
45
- check-success=fleet-ci/pr-merge
56
pull_request_rules:
@@ -85,7 +86,6 @@ pull_request_rules:
8586
- "#approved-reviews-by>=1"
8687
actions:
8788
queue:
88-
method: squash
8989
name: default
9090
- name: delete upstream branch with changes on ^.mergify.yml that has been merged or closed
9191
conditions:

0 commit comments

Comments
 (0)