Skip to content
Merged
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
19 changes: 16 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ queue_rules:
# ─────────────────────────────────────────────────────────────────────────
- name: dosubot
merge_method: squash
autoqueue: true
queue_conditions:
- base = main
- label != do-not-merge
Expand All @@ -17,7 +16,6 @@ queue_rules:
# ─────────────────────────────────────────────────────────────────────────
- name: dependabot-workflows
merge_method: squash
autoqueue: true
queue_conditions:
- base = main
- label != do-not-merge
Expand All @@ -31,7 +29,6 @@ queue_rules:
# ─────────────────────────────────────────────────────────────────────────
- name: dependabot
merge_method: squash
autoqueue: true
queue_conditions:
- base = main
- label != do-not-merge
Expand Down Expand Up @@ -163,3 +160,19 @@ merge_protections:
- "#commits-behind <= 3"
merge_protections_settings:
reporting_method: check-runs
# auto_merge_conditions reflects the queue_conditions of the queue rules that previously had autoqueue: true. The following queue rules were manual-only ('default') and remain reachable via the `/queue` command. Review and adjust if needed.
auto_merge_conditions:
- or:
- and:
- base = main
- label != do-not-merge
- author = dosubot[bot]
- and:
- base = main
- label != do-not-merge
- author = dependabot[bot]
- "-files ~= ^(?!\\.github/workflows/)"
- and:
- base = main
- label != do-not-merge
- author = dependabot[bot]
Loading