Merge branch 'master' into 'production' (4eabff92) · 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

4eabff92

Commit 4eabff92 authored 1 year ago by Tim Repke

Downloads
- Plain Diff

Merge branch 'master' into 'production'

Master

See merge request !41

parents 431a3afe 6a531ff8

No related branches found

No related tags found

1 merge request!41Master

Pipeline #1448 failed 1 year ago

Stage: build

Stage: test

Stage: deploy

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

requirements.txt 2 additions, 2 deletions

requirements.txt
server/__init__.py 1 addition, 1 deletion

server/__init__.py
server/api/errors.py 7 additions, 3 deletions

server/api/errors.py
server/api/routes/annotations.py 44 additions, 29 deletions

server/api/routes/annotations.py
server/api/routes/auth.py 41 additions, 12 deletions

server/api/routes/auth.py
server/api/routes/users.py 36 additions, 6 deletions

server/api/routes/users.py
server/util/security.py 1 addition, 1 deletion

server/util/security.py

with 132 additions and 54 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