merge queue: embarking main (6824365) and #11339 together#11341
Closed
mergify[bot] wants to merge 2 commits intomainfrom
Closed
merge queue: embarking main (6824365) and #11339 together#11341mergify[bot] wants to merge 2 commits intomainfrom
mergify[bot] wants to merge 2 commits intomainfrom
Conversation
Document the new `auto_merge_conditions` field in `merge_protections_settings`,
the conditional form of auto-merge that gates the action on a list of conditions
rather than firing for every PR.
The Auto-Merge page now covers both fields side-by-side, with a behavior matrix,
the rejected values (`false`, `null`, `{}`), the mutual-exclusion rules
(`auto_merge` and `autoqueue`), and four migration patterns: bot-only,
label-gated, multi-bot OR, and schedule-restricted. The `autoqueue` deprecation
callout in the queue rules page now points at `auto_merge_conditions` and the
Setup page reflects the recommended field in its example. The migration section
also documents the auto-migration transformer's translation rules and deadline
(2026-07-16).
`auto_merge` is positioned as the boolean shorthand but not yet marked
deprecated (formal deprecation flips with MRGFY-7083).
Fixes MRGFY-7108
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Change-Id: Ife6122a6078570f5dc803256ad674b55ac90d2d8
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch main (6824365) and #11339 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #11339.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:schedule=Mon-Fri 09:00-17:30[Europe/Paris]title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:#approved-reviews-by >= 2author = dependabot[bot]author = mergify-ci-botbody ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success = buildcheck-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/Required conditions to stay in the queue:
author != dependabot[bot]author != mergify-ci-bottitle ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?:#approved-reviews-by >= 2author = dependabot[bot]author = mergify-ci-botbody ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success = buildcheck-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/