From 88d889a979de05bab1a448b4c9f3a3fd33fc0d4b Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Tue, 10 Sep 2019 09:29:20 +0200 Subject: [PATCH] fix(github): try automerge even if push protection is enabled Closes #4460 --- lib/platform/github/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/platform/github/index.ts b/lib/platform/github/index.ts index 743f65bf28..db2df6a0cf 100644 --- a/lib/platform/github/index.ts +++ b/lib/platform/github/index.ts @@ -1617,7 +1617,7 @@ export async function updatePr(prNo: number, title: string, rawBody?: string) { export async function mergePr(prNo: number, branchName: string) { logger.debug(`mergePr(${prNo}, ${branchName})`); // istanbul ignore if - if (config.pushProtection) { + if (config.isGhe && config.pushProtection) { logger.info( { branch: branchName, prNo }, 'Branch protection: Cannot automerge PR when push protection is enabled' -- GitLab