Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2015-10-14 08:43:14 -05:00
parent b1b33c8527 421c0d0aba
commit 5b08ff0b34
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Providers/AuthServiceProvider.php
View File

@ -24,7 +24,7 @@ class AuthServiceProvider extends ServiceProvider
*/ */
public function boot(GateContract $gate) public function boot(GateContract $gate)
{ {
parent::registerPolicies($gate); $this->registerPolicies($gate);
// //
} }

3
config/broadcasting.php
View File

@ -33,6 +33,9 @@
'key' => env('PUSHER_KEY'), 'key' => env('PUSHER_KEY'),
'secret' => env('PUSHER_SECRET'), 'secret' => env('PUSHER_SECRET'),
'app_id' => env('PUSHER_APP_ID'), 'app_id' => env('PUSHER_APP_ID'),
'options' => [
//
],
], ],
'redis' => [ 'redis' => [

2
config/database.php
View File

@ -48,7 +48,7 @@
'sqlite' => [ 'sqlite' => [
'driver' => 'sqlite', 'driver' => 'sqlite',
'database' => storage_path('database.sqlite'), 'database' => database_path('database.sqlite'),
'prefix' => '', 'prefix' => '',
], ],

3
phpunit.xml
View File

@ -7,8 +7,7 @@
convertNoticesToExceptions="true" convertNoticesToExceptions="true"
convertWarningsToExceptions="true" convertWarningsToExceptions="true"
processIsolation="false" processIsolation="false"
stopOnFailure="false" stopOnFailure="false">
syntaxCheck="false">
<testsuites> <testsuites>
<testsuite name="Application Test Suite"> <testsuite name="Application Test Suite">
<directory>./tests/</directory> <directory>./tests/</directory>