Merge pull request #928 from Pingu501/bugfix/wrong-gitlab-api-version-check

SISheogorath · web-flow · commit 72894d1b7d81 · 2018-08-23T16:27:04.000+02:00
BUGFIX: wrong version check for gitlab api
diff --git 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'
 }
 

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,8 @@ config.isOAuth2Enable = config.oauth2.clientID && config.oauth2.clientSecret`
`104`	`104`	`config.isPDFExportEnable = config.allowPDFExport`
`105`	`105`
`106`	`106`	`// Check gitlab api version`
`107`		`-if (config.gitlab.version !== 'v4' \|\| config.gitlab.version !== 'v3') {`
`108`		`- logger.warn('config.js contains wrong version (' + config.gitlab.version + ') for gitlab api; it should be \'v3\' or \'v4\'. Defaulting to v3')`
	`107`	`+if (config.gitlab.version !== 'v4' && config.gitlab.version !== 'v3') {`
	`108`	`+ logger.warn('config.js contains wrong version (' + config.gitlab.version + ') for gitlab api; it should be \'v3\' or \'v4\'. Defaulting to v4')`
`109`	`109`	`config.gitlab.version = 'v4'`
`110`	`110`	`}`
`111`	`111`