Merge pull request #964 from SISheogorath/fix/gitlabWarning

SISheogorath · web-flow · commit bdf897d31c7e · 2018-09-25T11:23:40.000+02:00
Omit unneeded warning if no gitlab is configured
diff --git a/lib/config/index.js b/lib/config/index.js
@@ -104,7 +104,7 @@ 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') {
+if (config.gitlab && 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,7 +104,7 @@ 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') {`
	`107`	`+if (config.gitlab && config.gitlab.version !== 'v4' && config.gitlab.version !== 'v3') {`
`108`	`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`	`}`