resolved merge conflicts
Showing
- .jhipster/Likes.json 31 additions, 0 deletions.jhipster/Likes.json
- .yo-rc.json 1 addition, 1 deletion.yo-rc.json
- package-lock.json 692 additions, 654 deletionspackage-lock.json
- package.json 16 additions, 13 deletionspackage.json
- pom.xml 1 addition, 1 deletionpom.xml
- src/main/java/at/ac/uibk/gitsearch/config/ApplicationProperties.java 81 additions, 10 deletions...va/at/ac/uibk/gitsearch/config/ApplicationProperties.java
- src/main/java/at/ac/uibk/gitsearch/config/CacheConfiguration.java 1 addition, 0 deletions.../java/at/ac/uibk/gitsearch/config/CacheConfiguration.java
- src/main/java/at/ac/uibk/gitsearch/config/SecurityConfiguration.java 2 additions, 0 deletions...va/at/ac/uibk/gitsearch/config/SecurityConfiguration.java
- src/main/java/at/ac/uibk/gitsearch/domain/Likes.java 115 additions, 0 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/Likes.java
- src/main/java/at/ac/uibk/gitsearch/domain/SavedSearches.java 0 additions, 1 deletionsrc/main/java/at/ac/uibk/gitsearch/domain/SavedSearches.java
- src/main/java/at/ac/uibk/gitsearch/domain/Statistics.java 0 additions, 1 deletionsrc/main/java/at/ac/uibk/gitsearch/domain/Statistics.java
- src/main/java/at/ac/uibk/gitsearch/domain/UserWatchList.java 0 additions, 1 deletionsrc/main/java/at/ac/uibk/gitsearch/domain/UserWatchList.java
- src/main/java/at/ac/uibk/gitsearch/repository/LikesRepository.java 20 additions, 0 deletions...java/at/ac/uibk/gitsearch/repository/LikesRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/gitlab/GitLabRepository.java 4 additions, 0 deletions...ac/uibk/gitsearch/repository/gitlab/GitLabRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/GitFilesRepository.java 3 additions, 2 deletions.../uibk/gitsearch/repository/search/GitFilesRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/GitFilesRepositoryImpl.java 20 additions, 17 deletions...k/gitsearch/repository/search/GitFilesRepositoryImpl.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/LikesSearchRepository.java 11 additions, 0 deletions...bk/gitsearch/repository/search/LikesSearchRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/MetaDataRepository.java 141 additions, 98 deletions.../uibk/gitsearch/repository/search/MetaDataRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/SearchRepositoryConstants.java 3 additions, 0 deletions...itsearch/repository/search/SearchRepositoryConstants.java
- src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java 43 additions, 19 deletions...main/java/at/ac/uibk/gitsearch/service/GitlabService.java
Please register or sign in to comment