Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

backend
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

43f9cf17

Commit 43f9cf17 authored 1 year ago by Anders Austlid

Downloads
- Plain Diff

Merge branch 'main' into epic/achievement-endpoint

Merge in changes from main

parents 1dad847e 8de3633e

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Dockerfile 9 additions, 0 deletions

Dockerfile
pom.xml 7 additions, 3 deletions

pom.xml
src/main/java/ntnu/idatt2016/v233/SmartMat/config/SecurityConfig.java 2 additions, 0 deletions

...a/ntnu/idatt2016/v233/SmartMat/config/SecurityConfig.java
src/main/java/ntnu/idatt2016/v233/SmartMat/controller/ShoppingListController.java 2 additions, 5 deletions

...2016/v233/SmartMat/controller/ShoppingListController.java
src/main/java/ntnu/idatt2016/v233/SmartMat/controller/UserController.java 11 additions, 5 deletions

...nu/idatt2016/v233/SmartMat/controller/UserController.java
src/main/java/ntnu/idatt2016/v233/SmartMat/repository/UserRepository.java 8 additions, 2 deletions

...nu/idatt2016/v233/SmartMat/repository/UserRepository.java
src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/UserService.java 10 additions, 2 deletions

...tnu/idatt2016/v233/SmartMat/service/user/UserService.java
src/test/java/ntnu/idatt2016/v233/SmartMat/repository/UserRepositoryTest.java 37 additions, 25 deletions

...datt2016/v233/SmartMat/repository/UserRepositoryTest.java
src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/UserServiceTest.java 185 additions, 0 deletions

...idatt2016/v233/SmartMat/service/user/UserServiceTest.java

with 271 additions and 42 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment