Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MetaGer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

6fd0ad04

Commit 6fd0ad04 authored 4 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development

See merge request !1846

parents 42c05822 e6714dc0

No related branches found

No related tags found

1 merge request!1846Development

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

Dockerfile 58 additions, 61 deletions

Dockerfile
DockerfileDev 52 additions, 55 deletions

DockerfileDev
app/Console/Commands/SaveUseragents.php 5 additions, 3 deletions

app/Console/Commands/SaveUseragents.php
chart/templates/deployment.yaml 2 additions, 2 deletions

chart/templates/deployment.yaml
config/nginx-default-dev.conf 0 additions, 26 deletions

config/nginx-default-dev.conf
config/nginx-default.conf 0 additions, 28 deletions

config/nginx-default.conf
config/nginx.conf 10 additions, 8 deletions

config/nginx.conf
docker-compose.yml 5 additions, 5 deletions

docker-compose.yml

with 132 additions and 188 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