Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

kypo-sandbox-service
- Activity
- Members
- Terraform modules

Snippets Groups Projects

2bf94bc0

Commit 2bf94bc0 authored 2 years ago by Michal Urban

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

merge develop into master

See merge request muni-kypo-crp/backend-python/kypo-sandbox-service!250

parents 13da6f85 f4ab3154

No related branches found

No related tags found

No related merge requests found

Changes 17

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 14 additions, 1 deletion

.gitlab-ci.yml
Dockerfile 4 additions, 2 deletions

Dockerfile
Pipfile 2 additions, 2 deletions

Pipfile
Pipfile.lock 228 additions, 187 deletions

Pipfile.lock
README.md 2 additions, 0 deletions

README.md
config.yml 4 additions, 0 deletions

config.yml
kypo/sandbox_ansible_app/lib/container.py 11 additions, 9 deletions

kypo/sandbox_ansible_app/lib/container.py
kypo/sandbox_common_lib/kypo_service_config.py 2 additions, 0 deletions

kypo/sandbox_common_lib/kypo_service_config.py
kypo/sandbox_instance_app/lib/nodes.py 28 additions, 3 deletions

kypo/sandbox_instance_app/lib/nodes.py
kypo/sandbox_instance_app/lib/pools.py 16 additions, 5 deletions

kypo/sandbox_instance_app/lib/pools.py
kypo/sandbox_instance_app/serializers.py 25 additions, 13 deletions

kypo/sandbox_instance_app/serializers.py
kypo/sandbox_instance_app/tests/test_pools.py 4 additions, 2 deletions

kypo/sandbox_instance_app/tests/test_pools.py
kypo/sandbox_instance_app/urls.py 7 additions, 4 deletions

kypo/sandbox_instance_app/urls.py
kypo/sandbox_instance_app/views.py 88 additions, 32 deletions

kypo/sandbox_instance_app/views.py
kypo/sandbox_service_project/settings.py 1 addition, 1 deletion

kypo/sandbox_service_project/settings.py
kypo/sandbox_service_project/tests/config.yml 4 additions, 0 deletions

kypo/sandbox_service_project/tests/config.yml
kypo/sandbox_service_project/tests/settings.py 1 addition, 1 deletion

kypo/sandbox_service_project/tests/settings.py

with 441 additions and 262 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