Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

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

Snippets Groups Projects

f3a72ec4

Commit f3a72ec4 authored 3 years ago by Christian Boettcher

Downloads
- Plain Diff

Merge branch 'master' into differentauth

parents 4d11122f dfa51908

No related branches found

No related tags found

1 merge request!6Differentauth

Pipeline #84237 passed 3 years ago

Stage: test

Stage: build

Changes 13
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 20 additions, 9 deletions

.gitlab-ci.yml
apiserver/config/settings.py 1 addition, 0 deletions

apiserver/config/settings.py
apiserver/main.py 24 additions, 2 deletions

apiserver/main.py
apiserver/storage/EncryptedJsonFileStorageAdapter.py 41 additions, 0 deletions

apiserver/storage/EncryptedJsonFileStorageAdapter.py
apiserver/storage/JsonFileStorageAdapter.py 13 additions, 4 deletions

apiserver/storage/JsonFileStorageAdapter.py
apiserver/storage/LocationStorage.py 3 additions, 0 deletions

apiserver/storage/LocationStorage.py
apiserver/storage/__init__.py 3 additions, 1 deletion

apiserver/storage/__init__.py
deploy_scripts/cloudinit.yml 0 additions, 3 deletions

deploy_scripts/cloudinit.yml
deploy_scripts/deployment.sh 2 additions, 2 deletions

deploy_scripts/deployment.sh
docker-compose.yml 1 addition, 0 deletions

docker-compose.yml
frontend/templates/base.html.jinja 1 addition, 3 deletions

frontend/templates/base.html.jinja
proxy_image/default_location 1 addition, 1 deletion

proxy_image/default_location
requirements.txt 1 addition, 0 deletions

requirements.txt

with 111 additions and 25 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