summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph (Sheogorath) Kern2018-08-23 16:27:04 +0200
committerGitHub2018-08-23 16:27:04 +0200
commit72894d1b7d816bd3c0f9197b7bf0674944f39901 (patch)
treea548e2065f26a24fa3df0302fbdf8ebf64cdf2dd
parent3a857a3ab39bd3961e70ccbb4fd5ed89a019e7c6 (diff)
parentf728fdb8ab0f034f28e17cccba709d4e842048f7 (diff)
Merge pull request #928 from Pingu501/bugfix/wrong-gitlab-api-version-check
BUGFIX: wrong version check for gitlab api
Diffstat (limited to '')
-rw-r--r--lib/config/index.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/config/index.js b/lib/config/index.js
index e66c513d..f96684ea 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -104,8 +104,8 @@ config.isOAuth2Enable = config.oauth2.clientID && config.oauth2.clientSecret
config.isPDFExportEnable = config.allowPDFExport
// Check gitlab api version
-if (config.gitlab.version !== 'v4' || config.gitlab.version !== 'v3') {
- logger.warn('config.js contains wrong version (' + config.gitlab.version + ') for gitlab api; it should be \'v3\' or \'v4\'. Defaulting to v3')
+if (config.gitlab.version !== 'v4' && config.gitlab.version !== 'v3') {
+ logger.warn('config.js contains wrong version (' + config.gitlab.version + ') for gitlab api; it should be \'v3\' or \'v4\'. Defaulting to v4')
config.gitlab.version = 'v4'
}