Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c479d528

Commit c479d528 authored 5 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development

See merge request !1435

parents 4ceba14d 85267ea6

No related branches found

No related tags found

2 merge requests!1504Master,!1435Development

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 4 additions, 0 deletions

.gitlab-ci.yml
app/Http/Controllers/AdminInterface.php 153 additions, 63 deletions

app/Http/Controllers/AdminInterface.php
app/Http/Middleware/RefererCheck.php 0 additions, 26 deletions

app/Http/Middleware/RefererCheck.php
build.sh 10 additions, 1 deletion

build.sh
database/migrations/2019_05_28_153442_create_users_table.php 36 additions, 0 deletions

database/migrations/2019_05_28_153442_create_users_table.php
database/seeds/DatabaseSeeder.php 1 addition, 1 deletion

database/seeds/DatabaseSeeder.php
database/seeds/UsersSeeder.php 16 additions, 0 deletions

database/seeds/UsersSeeder.php
resources/views/admin/countGraphToday.blade.php 41 additions, 0 deletions

resources/views/admin/countGraphToday.blade.php
routes/web.php 3 additions, 1 deletion

routes/web.php

with 264 additions and 92 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