resolve merge conflicts
Showing
- .eslintignore 1 addition, 0 deletions.eslintignore
- .eslintrc.json 2 additions, 1 deletion.eslintrc.json
- .husky/pre-commit 2 additions, 2 deletions.husky/pre-commit
- .prettierignore 1 addition, 0 deletions.prettierignore
- .project 0 additions, 1 deletion.project
- checkstyle.xml 4 additions, 0 deletionscheckstyle.xml
- manual_depoy.sh 3 additions, 4 deletionsmanual_depoy.sh
- package-lock.json 2396 additions, 864 deletionspackage-lock.json
- package.json 2 additions, 2 deletionspackage.json
- pom.xml 2 additions, 2 deletionspom.xml
- sonar-project.properties 1 addition, 1 deletionsonar-project.properties
- src/main/docker/gitsearch.yml 5 additions, 0 deletionssrc/main/docker/gitsearch.yml
- src/main/docker/keycloak.yml 3 additions, 0 deletionssrc/main/docker/keycloak.yml
- src/main/java/at/ac/uibk/gitsearch/config/SecurityConfiguration.java 10 additions, 19 deletions...va/at/ac/uibk/gitsearch/config/SecurityConfiguration.java
- src/main/java/at/ac/uibk/gitsearch/repository/gitlab/GitLabRepository.java 1 addition, 1 deletion...ac/uibk/gitsearch/repository/gitlab/GitLabRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/MetaDataRepository.java 8 additions, 3 deletions.../uibk/gitsearch/repository/search/MetaDataRepository.java
- src/main/java/at/ac/uibk/gitsearch/security/jwt/TokenProvider.java 4 additions, 42 deletions...java/at/ac/uibk/gitsearch/security/jwt/TokenProvider.java
- src/main/java/at/ac/uibk/gitsearch/security/oauth2/UserDetailsFetcher.java 56 additions, 27 deletions...ac/uibk/gitsearch/security/oauth2/UserDetailsFetcher.java
- src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java 0 additions, 1 deletion...main/java/at/ac/uibk/gitsearch/service/GitlabService.java
- src/main/java/at/ac/uibk/gitsearch/service/dto/AdminUserDTO.java 12 additions, 0 deletions...n/java/at/ac/uibk/gitsearch/service/dto/AdminUserDTO.java
Please register or sign in to comment