Merge branch 'master' into develop
This commit is contained in:
commit
5b08ff0b34
|
@ -24,7 +24,7 @@ class AuthServiceProvider extends ServiceProvider
|
|||
*/
|
||||
public function boot(GateContract $gate)
|
||||
{
|
||||
parent::registerPolicies($gate);
|
||||
$this->registerPolicies($gate);
|
||||
|
||||
//
|
||||
}
|
||||
|
|
|
@ -33,6 +33,9 @@
|
|||
'key' => env('PUSHER_KEY'),
|
||||
'secret' => env('PUSHER_SECRET'),
|
||||
'app_id' => env('PUSHER_APP_ID'),
|
||||
'options' => [
|
||||
//
|
||||
],
|
||||
],
|
||||
|
||||
'redis' => [
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
'sqlite' => [
|
||||
'driver' => 'sqlite',
|
||||
'database' => storage_path('database.sqlite'),
|
||||
'database' => database_path('database.sqlite'),
|
||||
'prefix' => '',
|
||||
],
|
||||
|
||||
|
|
|
@ -7,8 +7,7 @@
|
|||
convertNoticesToExceptions="true"
|
||||
convertWarningsToExceptions="true"
|
||||
processIsolation="false"
|
||||
stopOnFailure="false"
|
||||
syntaxCheck="false">
|
||||
stopOnFailure="false">
|
||||
<testsuites>
|
||||
<testsuite name="Application Test Suite">
|
||||
<directory>./tests/</directory>
|
||||
|
|
Loading…
Reference in New Issue