Skip to content

Commit 06169e9

Browse files
jcristaumergify[bot]
authored andcommitted
Update mergify config
Fixes "The configuration uses the deprecated merge_method attribute of the queue action in one or more pull_request_rules. It must now be used under the queue_rules configuration."
1 parent aa25895 commit 06169e9

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

.mergify.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ queue_rules:
22
- name: default
33
conditions:
44
- status-success=pr-complete
5+
merge_method: rebase
56
pull_request_rules:
67
- name: MickeyMoz - Auto Merge
78
conditions:
@@ -13,7 +14,6 @@ pull_request_rules:
1314
type: APPROVE
1415
message: MickeyMoz 💪
1516
queue:
16-
method: rebase
1717
name: default
1818
- name: Needs landing - Merge
1919
conditions:
@@ -22,5 +22,4 @@ pull_request_rules:
2222
- "#approved-reviews-by>=1"
2323
actions:
2424
queue:
25-
method: rebase
2625
name: default

0 commit comments

Comments
 (0)