Merge branch '1.1'

2015-08-03 22:26:02 +01:00
parent 5ce767dccc 578d4befef
commit 5d958bac81
2 changed files with 2 additions and 1 deletions
--- a/app/Http/Routes/AuthRoutes.php
+++ b/app/Http/Routes/AuthRoutes.php
@@ -33,7 +33,7 @@ class AuthRoutes

                $router->post('login', [
                    'middleware' => ['guest', 'csrf', 'throttling:10,10'],
-                    'as'         => 'logout',
+                    'as'         => 'login',
                    'uses'       => 'AuthController@postLogin',
                ]);

--- a/database/seeds/IncidentTableSeeder.php
+++ b/database/seeds/IncidentTableSeeder.php
@@ -47,6 +47,7 @@ class IncidentTableSeeder extends Seeder
            [
                'name'         => 'Test Incident',
                'message'      => 'Something went wrong, oh noes.',
+                'status'       => 1,
                'component_id' => 0,
                'scheduled_at' => null,
                'visible'      => 1,