Merge branch 'master' into 'production' (5cb126e9) · Commits · MCC APSIS / NACSOS / NACSOS Core · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

N

NACSOS Core
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5cb126e9

Commit 5cb126e9 authored 2 years ago by Tim Repke

Downloads
- Plain Diff

Merge branch 'master' into 'production'

New auth behaviour

See merge request !26

parents 1eff506c a76f3477

No related branches found

No related tags found

1 merge request!26New auth behaviour

Pipeline #1151 passed 2 years ago

Stage: build

Stage: test

Stage: deploy

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 31 additions, 31 deletions

.gitlab-ci.yml
config/default.env 2 additions, 2 deletions

config/default.env
requirements.txt 1 addition, 2 deletions

requirements.txt
server/api/routes/annotations.py 4 additions, 1 deletion

server/api/routes/annotations.py
server/api/routes/auth.py 25 additions, 95 deletions

server/api/routes/auth.py
server/api/routes/users.py 2 additions, 1 deletion

server/api/routes/users.py
server/util/security.py 27 additions, 106 deletions

server/util/security.py

with 92 additions and 238 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