resolve merge conflicts
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .gitlab-ci.yml 23 additions, 1 deletion.gitlab-ci.yml
- manual_deploy.sh 12 additions, 0 deletionsmanual_deploy.sh
- src/main/docker/elasticsearch.yml 26 additions, 24 deletionssrc/main/docker/elasticsearch.yml
- src/main/docker/gitsearch.yml 46 additions, 17 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/java/at/ac/uibk/gitsearch/domain/Authority.java 23 additions, 10 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/Authority.java
- src/main/java/at/ac/uibk/gitsearch/security/oauth2/UserDetailsFetcher.java 0 additions, 1 deletion...ac/uibk/gitsearch/security/oauth2/UserDetailsFetcher.java
- src/main/java/at/ac/uibk/gitsearch/service/SearchService.java 6 additions, 6 deletions...main/java/at/ac/uibk/gitsearch/service/SearchService.java
- src/main/java/at/ac/uibk/gitsearch/service/UserService.java 6 additions, 1 deletionsrc/main/java/at/ac/uibk/gitsearch/service/UserService.java
- src/main/resources/config/application-dev.yml 10 additions, 10 deletionssrc/main/resources/config/application-dev.yml
- src/main/resources/config/application-prod.yml 6 additions, 6 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/main/resources/config/liquibase/master.xml 4 additions, 1 deletionsrc/main/resources/config/liquibase/master.xml
- src/main/webapp/app/admin/review-management/review-management-update/review-management-update.component.spec.ts 1 addition, 0 deletions...agement-update/review-management-update.component.spec.ts
- src/main/webapp/app/layouts/navbar/navbar.component.html 2 additions, 0 deletionssrc/main/webapp/app/layouts/navbar/navbar.component.html
- src/test/resources/config/application.yml 9 additions, 9 deletionssrc/test/resources/config/application.yml
Please register or sign in to comment