Skip to content

S
syncEnrollments
Commit 5b08ff0b authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge branch 'master' into develop

parents b1b33c85 421c0d0a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
app/Providers/AuthServiceProvider.php
View file @ 5b08ff0b
...@@ -24,7 +24,7 @@ class AuthServiceProvider extends ServiceProvider ...@@ -24,7 +24,7 @@ class AuthServiceProvider extends ServiceProvider
*/ */
public function boot(GateContract $gate) public function boot(GateContract $gate)
{ {
parent::registerPolicies($gate); $this->registerPolicies($gate);
// //
} }
......
config/broadcasting.php
View file @ 5b08ff0b
...@@ -33,6 +33,9 @@ return [ ...@@ -33,6 +33,9 @@ return [
'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' => [
......
config/database.php
View file @ 5b08ff0b
...@@ -48,7 +48,7 @@ return [ ...@@ -48,7 +48,7 @@ return [
'sqlite' => [ 'sqlite' => [
'driver' => 'sqlite', 'driver' => 'sqlite',
'database' => storage_path('database.sqlite'), 'database' => database_path('database.sqlite'),
'prefix' => '', 'prefix' => '',
], ],
......
phpunit.xml
View file @ 5b08ff0b
...@@ -7,8 +7,7 @@ ...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment