From 44d84e56f52061a7f128bcdee45e1d854bac7567 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 8 Oct 2018 14:29:02 +0200
Subject: [PATCH] =?UTF-8?q?fix(gitlab):=20don=E2=80=99t=20warn=20for=20clo?=
=?UTF-8?q?sed=20MRs=20with=20404=20branch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #2614
---
lib/platform/gitlab/index.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/platform/gitlab/index.js b/lib/platform/gitlab/index.js
index 5b8beb3546..78ba8387f2 100644
--- a/lib/platform/gitlab/index.js
+++ b/lib/platform/gitlab/index.js
@@ -703,8 +703,10 @@ async function getPr(iid) {
pr.canRebase = true;
}
} catch (err) {
- logger.warn({ err }, 'Error getting PR branch');
- pr.isConflicted = true;
+ if (pr.state === 'open' || err.statusCode !== 404) {
+ logger.warn({ err }, 'Error getting PR branch');
+ pr.isConflicted = true;
+ }
}
return pr;
}
--
GitLab