From d1a40c548c56ab02f9181bc9d0d125e92e487270 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Tue, 25 Feb 2020 09:12:56 +0100
Subject: [PATCH] fix(gitlab): add merge method fallback (#5571)
---
lib/platform/gitlab/index.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/platform/gitlab/index.ts b/lib/platform/gitlab/index.ts
index 17e8a527fc..e86f7cb092 100644
--- a/lib/platform/gitlab/index.ts
+++ b/lib/platform/gitlab/index.ts
@@ -202,7 +202,7 @@ export async function initRepo({
}
config.defaultBranch = res.body.default_branch;
config.baseBranch = config.defaultBranch;
- config.mergeMethod = res.body.merge_method;
+ config.mergeMethod = res.body.merge_method || 'merge';
logger.debug(`${repository} default branch = ${config.baseBranch}`);
// Discover our user email
config.email = (await api.get(`user`)).body.email;
--
GitLab