From a5835a00de56049ab10a3ed43a5b1002f4ce83c5 Mon Sep 17 00:00:00 2001
From: ankitabhopatkar13 <ankitabhopatkar13@gmail.com>
Date: Tue, 2 Nov 2021 14:17:53 +0100
Subject: [PATCH] fix(automerge): remove automergeType check for PR options
(#12418)
---
docs/usage/configuration-options.md | 2 +-
lib/workers/pr/index.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md
index 0bc3da808d..d7744bcc35 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 64a77f855e..3825a54145 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
);
--
GitLab