resolve merge conflicts
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .gitlab-ci.yml 23 additions, 1 deletion.gitlab-ci.yml
- .vscode/launch.json 2 additions, 1 deletion.vscode/launch.json
- manual_deploy.sh 0 additions, 1 deletionmanual_deploy.sh
- src/main/docker/elasticsearch.yml 1 addition, 1 deletionsrc/main/docker/elasticsearch.yml
- src/main/docker/gitsearch.yml 15 additions, 13 deletionssrc/main/docker/gitsearch.yml
- src/main/docker/jhipster-control-center.yml 2 additions, 32 deletionssrc/main/docker/jhipster-control-center.yml
- src/main/docker/keycloak.yml 7 additions, 7 deletionssrc/main/docker/keycloak.yml
- src/main/docker/monitoring.yml 1 addition, 1 deletionsrc/main/docker/monitoring.yml
- src/main/resources/config/application-dev.yml 10 additions, 10 deletionssrc/main/resources/config/application-dev.yml
- src/main/resources/config/application-prod.yml 3 additions, 3 deletionssrc/main/resources/config/application-prod.yml
- src/main/resources/config/application-staging.yml 2 additions, 2 deletionssrc/main/resources/config/application-staging.yml
- src/test/resources/config/application.yml 11 additions, 11 deletionssrc/test/resources/config/application.yml
Please register or sign in to comment