ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Taylor Otwell
2015-10-29 09:59:38 -05:00
parent 58bc5273b8 892ab27f8d
commit 4b1322e9a0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/User.php
View File

@@ -10,9 +10,10 @@ use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract; use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
class User extends Model implements AuthenticatableContract, class User extends Model implements
AuthorizableContract, AuthenticatableContract,
CanResetPasswordContract AuthorizableContract,
CanResetPasswordContract
{ {
use Authenticatable, Authorizable, CanResetPassword; use Authenticatable, Authorizable, CanResetPassword;

6
config/database.php
View File

@@ -116,9 +116,9 @@ return [
'cluster' => false, 'cluster' => false,
'default' => [ 'default' => [
'host' => '127.0.0.1', 'host' => env('REDIS_HOST', '127.0.0.1'),
'port' => 6379, 'port' => env('REDIS_PORT', 6379),
'database' => 0, 'database' => env('REDIS_DB', 0),
], ],
], ],