Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

atdb-ldv
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a9003216

Commit a9003216 authored 4 years ago by Nico Vermaas

Downloads
- Plain Diff

Merge branch 'release' into 'master'

Release

See merge request !15

parents 4488f087 1ed9e39f

No related branches found

No related tags found

4 merge requests!39Dev nico,!18Acceptance,!17pre-deploy to acceptance,!15Release

Pipeline #9373 passed 4 years ago

Stage: build

Changes 5
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
atdb/atdb/settings/base.py 1 addition, 1 deletion

atdb/atdb/settings/base.py
atdb/atdb/settings/docker_sdc.py 1 addition, 7 deletions

atdb/atdb/settings/docker_sdc.py
atdb/atdb/settings/prod.py 0 additions, 40 deletions

atdb/atdb/settings/prod.py
atdb/taskdatabase/templates/taskdatabase/index.html 1 addition, 1 deletion

atdb/taskdatabase/templates/taskdatabase/index.html

with 4 additions and 50 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