Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

906b4aaf

Commit 906b4aaf authored 4 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development

See merge request !1643

parents 49521b2e bc9a35da

No related branches found

No related tags found

1 merge request!1643Development

Changes 11
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 5 additions, 68 deletions

.gitlab-ci.yml
Dockerfile 5 additions, 1 deletion

Dockerfile
app/Http/Controllers/MetaGerSearch.php 15 additions, 6 deletions

app/Http/Controllers/MetaGerSearch.php
app/Http/Middleware/HumanVerification.php 11 additions, 5 deletions

app/Http/Middleware/HumanVerification.php
app/Models/Quicktips/Quicktips.php 15 additions, 4 deletions

app/Models/Quicktips/Quicktips.php
app/Models/Searchengine.php 7 additions, 2 deletions

app/Models/Searchengine.php
app/PrometheusExporter.php 22 additions, 5 deletions

app/PrometheusExporter.php
chart/templates/deployment.yaml 51 additions, 0 deletions

chart/templates/deployment.yaml
contributor license agreement.md 79 additions, 0 deletions

contributor license agreement.md
resources/views/datenschutz/english.blade.php 2 additions, 3 deletions

resources/views/datenschutz/english.blade.php
resources/views/datenschutz/german.blade.php 2 additions, 3 deletions

resources/views/datenschutz/german.blade.php

with 214 additions and 97 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