Fix merge conflicts (dd5d4f1a) · Commits · Janek / dashboard · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dashboard
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Model experiments

Snippets Groups Projects

Admin message

Due to spam, we had to disable registrations and GitHub login. Please reach out to us at support@greenhost.net if you want to contribute.

dd5d4f1a

Commit dd5d4f1a authored 2 years ago by Mart van Santen

Downloads
- Plain Diff

Fix merge conflicts

Merge branch 'main' into 45-allow-database-to-have-external-apps

parents 7da5761d 95eb8db5

No related branches found

No related tags found

Loading

Changes 5

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.pylintrc 0 additions, 600 deletions

.pylintrc
areas/apps/apps.py 0 additions, 4 deletions

areas/apps/apps.py
areas/apps/models.py 100 additions, 54 deletions

areas/apps/models.py
cliapp/cliapp/cli.py 15 additions, 11 deletions

cliapp/cliapp/cli.py
helpers/kubernetes.py 148 additions, 134 deletions

helpers/kubernetes.py

with 263 additions and 803 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