diff --git a/src/components/ApiReference/openapi.ts b/src/components/ApiReference/openapi.ts index f63a85020a..332f0f5719 100644 --- a/src/components/ApiReference/openapi.ts +++ b/src/components/ApiReference/openapi.ts @@ -173,21 +173,6 @@ export function preprocessSchema(schema: OpenAPISpec): OpenAPISpec { title: 'MatchingConditionsDict-Limited', }; - // Strip hidden fields - const hidden = ['autosquash']; - const deepRemove = (v: unknown, key: string): void => { - if (Array.isArray(v)) { - for (const item of v) deepRemove(item, key); - return; - } - if (v && typeof v === 'object') { - const obj = v as Record; - if (Object.prototype.hasOwnProperty.call(obj, key)) delete obj[key]; - for (const k of Object.keys(obj)) deepRemove(obj[k], key); - } - }; - for (const field of hidden) deepRemove(s, field); - return s; } diff --git a/src/content/docs/merge-protections/builtin.mdx b/src/content/docs/merge-protections/builtin.mdx index 2a4532e1ac..c353e05626 100644 --- a/src/content/docs/merge-protections/builtin.mdx +++ b/src/content/docs/merge-protections/builtin.mdx @@ -53,10 +53,12 @@ The merge queue status [API](/api/usage) reports the same list as `depends_on_pull_requests`. The queue shows this only for the pull requests ahead of it in a -[stack](/merge-queue/stacks) in the same repository. Any other dependency still -blocks the merge without appearing there, whether it points at a pull request -in another repository or at one in the same repository that is not part of the -same stack. +[stack](/merge-queue/stacks) in the same repository, and only while they are +still queued: one that has merged or been +[dequeued](/merge-queue/lifecycle#removing-a-pull-request-from-the-merge-queue) +leaves the list. Any other dependency still blocks the merge without appearing +there, whether it points at a pull request in another repository or at one in +the same repository that is not part of the same stack. ## Merge-After @@ -71,6 +73,11 @@ Useful for coordinated releases or off-peak deploy windows. Using Merge-After in the pull request body on GitHub +A value Mergify cannot read as a timestamp blocks the pull request +indefinitely rather than failing the protection outright. The check reports +`Merge-After date is invalid` alongside the value it read; fix the header in +the pull request body to unblock it. + ## Configuration Changed When a pull request targeting your default branch modifies your [Mergify