Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

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

Snippets Groups Projects

e3395ded

Commit e3395ded authored 2 years ago by Maier, Andreas

Downloads
- Plain Diff

Merge branch 'production' into 'development'

Production

See merge request !2

Former-commit-id: d17d283f

parents ac87636e 5bc5f5ea

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Dockerfile 1 addition, 1 deletion

Dockerfile
docker-compose-prod.yml 1 addition, 1 deletion

docker-compose-prod.yml
drugstone/management/commands/make_graphs.py 1 addition, 1 deletion

drugstone/management/commands/make_graphs.py
drugstone/management/commands/populate_db.py 2 additions, 2 deletions

drugstone/management/commands/populate_db.py
drugstone/urls.py 3 additions, 1 deletion

drugstone/urls.py
drugstone/views.py 36 additions, 14 deletions

drugstone/views.py
scripts/docker-entrypoint.sh 1 addition, 1 deletion

scripts/docker-entrypoint.sh

with 45 additions and 21 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