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

a26245fd

Commit a26245fd authored 2 years ago by Tim Repke

Downloads
- Plain Diff

Merge branch 'master' into 'production'

resolve import issues

See merge request !30

parents 50c8f847 4de98529

No related branches found

No related tags found

1 merge request!30resolve import issues

Pipeline #1183 passed 2 years ago

Stage: build

Stage: test

Stage: deploy

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

config/default.env 4 additions, 1 deletion

config/default.env
requirements.txt 1 addition, 1 deletion

requirements.txt
requirements_dev.txt 2 additions, 2 deletions

requirements_dev.txt
server/api/routes/annotations.py 9 additions, 1 deletion

server/api/routes/annotations.py
server/api/routes/imports.py 2 additions, 0 deletions

server/api/routes/imports.py
server/api/routes/project/permissions.py 4 additions, 1 deletion

server/api/routes/project/permissions.py
server/util/config.py 1 addition, 1 deletion

server/util/config.py

with 23 additions and 7 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