Merge remote-tracking branch 'origin/development' into monitoring
# Conflicts: # src/main/java/at/ac/uibk/gitsearch/repository/UserRepository.java # src/main/java/at/ac/uibk/gitsearch/service/SearchService.java # src/main/java/at/ac/uibk/gitsearch/service/UserService.java
Showing
- .classpath 12 additions, 6 deletions.classpath
- .eslintrc.json 9 additions, 1 deletion.eslintrc.json
- .gitignore 5 additions, 0 deletions.gitignore
- .gitlab-ci.yml 51 additions, 9 deletions.gitlab-ci.yml
- .pmd 8 additions, 0 deletions.pmd
- .prettierrc 1 addition, 1 deletion.prettierrc
- .project 6 additions, 0 deletions.project
- .ruleset 455 additions, 0 deletions.ruleset
- .settings/org.eclipse.jdt.apt.core.prefs 0 additions, 4 deletions.settings/org.eclipse.jdt.apt.core.prefs
- .settings/org.eclipse.m2e.core.prefs 1 addition, 1 deletion.settings/org.eclipse.m2e.core.prefs
- .vscode/launch.json 20 additions, 24 deletions.vscode/launch.json
- .vscode/settings.json 4 additions, 4 deletions.vscode/settings.json
- .vscode/tasks.json 15 additions, 15 deletions.vscode/tasks.json
- angular.json 5 additions, 1 deletionangular.json
- docker-compose.yml 5 additions, 5 deletionsdocker-compose.yml
- package-lock.json 1 addition, 1 deletionpackage-lock.json
- pmd_rules.xml 60 additions, 0 deletionspmd_rules.xml
- pom.xml 3 additions, 3 deletionspom.xml
- src/main/java/at/ac/uibk/gitsearch/GitsearchApp.java 1 addition, 2 deletionssrc/main/java/at/ac/uibk/gitsearch/GitsearchApp.java
- src/main/java/at/ac/uibk/gitsearch/aop/logging/LoggingAspect.java 2 additions, 2 deletions.../java/at/ac/uibk/gitsearch/aop/logging/LoggingAspect.java
Please register or sign in to comment