Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ queue_rules:
merge_conditions: []
merge_method: fast-forward
update_method: rebase
autosquash: true
- name: Queue PRs for rebase-merge when CI passes and approved
queue_conditions:
- and: *label_automerge
Expand All @@ -46,7 +45,6 @@ queue_rules:
merge_conditions: []
merge_method: fast-forward
update_method: rebase
autosquash: true
merge_bot_account: *name_merge_bot
update_bot_account: *name_merge_bot

Expand Down Expand Up @@ -84,7 +82,6 @@ pull_request_rules:
- and: *label_approved
actions:
rebase:
autosquash: true
bot_account: *name_merge_bot
label:
remove:
Expand All @@ -95,7 +92,6 @@ pull_request_rules:
- and: *label_rebase
actions:
rebase:
autosquash: true
bot_account: *name_merge_bot
label:
remove:
Expand All @@ -108,14 +104,15 @@ pull_request_rules:
label:
remove:
- requeue
- name: Queue PRs for rebase-merge when CI passes and approved + Re-queue any PR with
a 'requeue' label
- name: Queue PRs for rebase-merge when CI passes and approved + Re-queue any PR with a
'requeue' label
conditions: []
actions:
queue:
priority_rules:
- name: priority for queue `duplicated Queue PRs for rebase-merge when CI passes and
- name: priority for queue `duplicated Queue PRs for rebase-merge when CI passes and
approved from Re-queue any PR with a 'requeue' label`
conditions:
- label=requeue
priority: 2250
allow_checks_interruption: true