diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md index 0bc3da808d4393f8c0c3915c39d4df64f55f8f08..d7744bcc3549ccf1d51660ddb90b988f34fa8bc9 100644 --- a/docs/usage/configuration-options.md +++ b/docs/usage/configuration-options.md @@ -754,7 +754,7 @@ Example: Ignore the default project level approval(s), so that Renovate bot can automerge its merge requests, without needing approval(s). Under the hood, it creates a MR-level approval rule where `approvals_required` is set to `0`. -This option works only when `automerge=true`, `automergeType=pr` and `platformAutomerge=true`. +This option works only when `automerge=true`, `automergeType=pr` or `automergeType=branch` and `platformAutomerge=true`. Also, approval rules overriding should not be [prevented in GitLab settings](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/settings.html#prevent-editing-approval-rules-in-merge-requests). ## golang diff --git a/lib/workers/pr/index.ts b/lib/workers/pr/index.ts index 64a77f855e92ed6f871a31ab2392aa4776c668eb..3825a54145a2d1af6f70f6cf17c289ead4157e65 100644 --- a/lib/workers/pr/index.ts +++ b/lib/workers/pr/index.ts @@ -120,7 +120,7 @@ export function getPlatformPrOptions( ): PlatformPrOptions { const usePlatformAutomerge = Boolean( config.automerge && - config.automergeType === 'pr' && + (config.automergeType === 'pr' || config.automergeType === 'branch') && config.platformAutomerge );