Merge branch 'develop'
This commit is contained in:
Vendored
+1
-1
@@ -11,7 +11,7 @@ pipeline {
|
||||
steps {
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=336']) {
|
||||
withEnv(['NEXT_BUILD_NUMBER=337']) {
|
||||
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
|
||||
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
|
||||
+3
-2
@@ -36,10 +36,11 @@
|
||||
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah"/>
|
||||
</httpModules>
|
||||
<!--Nascondo gli erroracci-->
|
||||
<customErrors mode="On" defaultRedirect="~/site/Default"/>
|
||||
<!--<customErrors mode="On" defaultRedirect="~/site/Default"/>-->
|
||||
<!--<customErrors mode="On" defaultRedirect="~/"/>-->
|
||||
<!--<customErrors mode="On" defaultRedirect="~/site/ErrorsLog"/>-->
|
||||
<!--Mostro gli erroracci-->
|
||||
<!--<customErrors mode="Off"/>-->
|
||||
<customErrors mode="Off"/>
|
||||
</system.web>
|
||||
<appSettings>
|
||||
<!--Configurazioni generali-->
|
||||
|
||||
Reference in New Issue
Block a user