resolve merge conflicts
Showing
- .eclipse-pmd 1 addition, 4 deletions.eclipse-pmd
- .eslintrc.json 2 additions, 1 deletion.eslintrc.json
- .gitignore 4 additions, 4 deletions.gitignore
- .gitlab-ci.yml 1 addition, 0 deletions.gitlab-ci.yml
- .vscode/settings.json 8 additions, 1 deletion.vscode/settings.json
- src/main/java/at/ac/uibk/gitsearch/config/LiquibaseConfiguration.java 9 additions, 4 deletions...a/at/ac/uibk/gitsearch/config/LiquibaseConfiguration.java
- src/main/java/at/ac/uibk/gitsearch/config/SecurityConfiguration.java 1 addition, 0 deletions...va/at/ac/uibk/gitsearch/config/SecurityConfiguration.java
- src/main/java/at/ac/uibk/gitsearch/domain/Review.java 150 additions, 0 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/Review.java
- src/main/java/at/ac/uibk/gitsearch/domain/ReviewRating.java 113 additions, 0 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/ReviewRating.java
- src/main/java/at/ac/uibk/gitsearch/domain/Statistics.java 12 additions, 4 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/Statistics.java
- src/main/java/at/ac/uibk/gitsearch/domain/User.java 27 additions, 0 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/User.java
- src/main/java/at/ac/uibk/gitsearch/repository/jpa/AuthorityRepository.java 2 additions, 0 deletions...ac/uibk/gitsearch/repository/jpa/AuthorityRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/jpa/ReviewRatingRepository.java 11 additions, 0 deletions...uibk/gitsearch/repository/jpa/ReviewRatingRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/jpa/ReviewRepository.java 12 additions, 0 deletions...at/ac/uibk/gitsearch/repository/jpa/ReviewRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/jpa/StatisticsRepository.java 2 additions, 0 deletions...c/uibk/gitsearch/repository/jpa/StatisticsRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/jpa/UserRepository.java 4 additions, 0 deletions...a/at/ac/uibk/gitsearch/repository/jpa/UserRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/MetaDataRepository.java 4 additions, 0 deletions.../uibk/gitsearch/repository/search/MetaDataRepository.java
- src/main/java/at/ac/uibk/gitsearch/service/MailService.java 37 additions, 7 deletionssrc/main/java/at/ac/uibk/gitsearch/service/MailService.java
- src/main/java/at/ac/uibk/gitsearch/service/MonitoringService.java 2 additions, 2 deletions.../java/at/ac/uibk/gitsearch/service/MonitoringService.java
- src/main/java/at/ac/uibk/gitsearch/service/ReviewService.java 348 additions, 0 deletions...main/java/at/ac/uibk/gitsearch/service/ReviewService.java
Please register or sign in to comment