From aebd63eebeebc3b27a8671f077d0446f3ccb0a6f Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Sun, 10 Dec 2017 15:38:47 +0100
Subject: [PATCH] refactor: use consistent log messages for branch protection
---
lib/platform/github/index.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/platform/github/index.js b/lib/platform/github/index.js
index f63016e5e0..71f244144e 100644
--- a/lib/platform/github/index.js
+++ b/lib/platform/github/index.js
@@ -322,7 +322,7 @@ async function mergeBranch(branchName, mergeType) {
if (config.pushProtection) {
logger.info(
{ branchName, mergeType },
- 'Attempting to merge branch when push protection is enabled'
+ 'Branch protection: Attempting to merge branch when push protection is enabled'
);
}
if (mergeType === 'branch-push') {
@@ -638,14 +638,14 @@ async function mergePr(prNo, branchName) {
if (config.pushProtection) {
logger.info(
{ branchName, prNo },
- 'Attempting to merge PR when push protection is enabled'
+ 'Branch protection: Attempting to merge PR when push protection is enabled'
);
}
// istanbul ignore if
if (config.prReviewsRequired) {
logger.info(
{ branchName, prNo },
- 'Attempting to merge PR when PR reviews are enabled'
+ 'Branch protection: Attempting to merge PR when PR reviews are enabled'
);
}
const url = `repos/${config.repoName}/pulls/${prNo}/merge`;
--
GitLab