Merge branch '2.x' (6eb2d395) · Commits · ARSnova / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ARSnova Backend
- Activity
- Members
- Labels
- Releases
- Environments
- Incidents

Snippets Groups Projects

6eb2d395

There was an error fetching the commit references. Please try again later.

Commit 6eb2d395 authored 6 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch '2.x'

parents 6f825c10 46fc6996

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 6 additions, 1 deletion

pom.xml
src/main/java/de/thm/arsnova/config/SecurityConfig.java 9 additions, 4 deletions

src/main/java/de/thm/arsnova/config/SecurityConfig.java
src/main/java/de/thm/arsnova/controller/v2/AuthenticationController.java 3 additions, 4 deletions

...e/thm/arsnova/controller/v2/AuthenticationController.java
src/main/java/de/thm/arsnova/security/pac4j/OauthUserDetailsService.java 3 additions, 3 deletions

...e/thm/arsnova/security/pac4j/OauthUserDetailsService.java
src/test/java/de/thm/arsnova/config/TestSecurityConfig.java 2 additions, 2 deletions

src/test/java/de/thm/arsnova/config/TestSecurityConfig.java
src/test/java/de/thm/arsnova/service/UserServiceTest.java 6 additions, 10 deletions

src/test/java/de/thm/arsnova/service/UserServiceTest.java

with 29 additions and 24 deletions

0% 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