-
- Downloads
Merge branch 'develop' into '34-improve-properties-file-handling-for-docker-deployment'
# Conflicts: # src/main/resources/application.properties
Showing
- NOTICE 1 addition, 1 deletionNOTICE
- build.gradle 1 addition, 1 deletionbuild.gradle
- build_and_publish.sh 0 additions, 7 deletionsbuild_and_publish.sh
- docker/nmaas-platform.properties.template 1 addition, 2 deletionsdocker/nmaas-platform.properties.template
- src/integrationTest/resources/application.properties 1 addition, 2 deletionssrc/integrationTest/resources/application.properties
- src/main/java/net/geant/nmaas/externalservices/gitlab/GitLabManager.java 12 additions, 16 deletions...et/geant/nmaas/externalservices/gitlab/GitLabManager.java
- src/main/java/net/geant/nmaas/nmservice/configuration/gitlab/GitLabConfigHandler.java 4 additions, 4 deletions...s/nmservice/configuration/gitlab/GitLabConfigHandler.java
- src/main/java/net/geant/nmaas/portal/api/market/ApplicationController.java 50 additions, 12 deletions.../geant/nmaas/portal/api/market/ApplicationController.java
- src/main/java/net/geant/nmaas/portal/service/impl/ApplicationBaseServiceImpl.java 1 addition, 1 deletion...nmaas/portal/service/impl/ApplicationBaseServiceImpl.java
- src/main/resources/application.properties 3 additions, 2 deletionssrc/main/resources/application.properties
- src/main/resources/changelog.json 11 additions, 0 deletionssrc/main/resources/changelog.json
- src/test/java/net/geant/nmaas/externalservices/gitlab/GitLabManagerTest.java 18 additions, 12 deletions...eant/nmaas/externalservices/gitlab/GitLabManagerTest.java
- src/test/java/net/geant/nmaas/nmservice/configuration/gitlab/GitLabConfigHandlerTest.java 1 addition, 2 deletions...service/configuration/gitlab/GitLabConfigHandlerTest.java
- src/test/resources/application.properties 1 addition, 2 deletionssrc/test/resources/application.properties
- src/test/shell/data/i18n/de.json 1 addition, 0 deletionssrc/test/shell/data/i18n/de.json
- src/test/shell/data/i18n/en.json 1 addition, 0 deletionssrc/test/shell/data/i18n/en.json
- src/test/shell/data/i18n/fr.json 1 addition, 0 deletionssrc/test/shell/data/i18n/fr.json
- src/test/shell/data/i18n/pl.json 1 addition, 0 deletionssrc/test/shell/data/i18n/pl.json
Loading
Please register or sign in to comment