Merge branch 'master' into develop

4cefc88f · Graham Campbell · 1aefbc9a · f2348b78 · 4cefc88f · 4cefc88f
Commit 4cefc88f authored Oct 30, 2015 by Graham Campbell
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

auth.php config/auth.php +2 -2

queue.php config/queue.php +7 -7

No files found.
--- a/config/auth.php
+++ b/config/auth.php
@@ -59,8 +59,8 @@ return [
    */

    'password' => [
-        'email' => 'emails.password',
-        'table' => 'password_resets',
+        'email'  => 'emails.password',
+        'table'  => 'password_resets',
        'expire' => 60,
    ],


--- a/config/queue.php
+++ b/config/queue.php
@@ -37,8 +37,8 @@ return [

        'database' => [
            'driver' => 'database',
-            'table' => 'jobs',
-            'queue' => 'default',
+            'table'  => 'jobs',
+            'queue'  => 'default',
            'expire' => 60,
        ],

@@ -67,10 +67,10 @@ return [
        ],

        'redis' => [
-            'driver' => 'redis',
+            'driver'     => 'redis',
            'connection' => 'default',
-            'queue'  => 'default',
-            'expire' => 60,
+            'queue'      => 'default',
+            'expire'     => 60,
        ],

    ],
@@ -87,8 +87,8 @@ return [
    */

    'failed' => [
-        'database'  => env('DB_CONNECTION', 'mysql'),
-        'table' => 'failed_jobs',
+        'database' => env('DB_CONNECTION', 'mysql'),
+        'table'    => 'failed_jobs',
    ],

 ];