Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

b2dc6d64

Commit b2dc6d64 authored 4 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development

See merge request !1568

parents 22f74181 b047ee06

Branches

No related tags found

3 merge requests!1645Development,!1641Development,!1568Development

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 37 additions, 1 deletion

.gitlab-ci.yml
app/Http/Controllers/AdminInterface.php 10 additions, 6 deletions

app/Http/Controllers/AdminInterface.php
app/Http/Controllers/StartpageController.php 0 additions, 1 deletion

app/Http/Controllers/StartpageController.php
app/Jobs/ConvertCountFile.php 20 additions, 15 deletions

app/Jobs/ConvertCountFile.php
resources/views/plugin.blade.php 1 addition, 1 deletion

resources/views/plugin.blade.php

with 68 additions and 24 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