Merge branch 'master' into develop

This commit is contained in:
Graham Campbell 2020-03-14 11:16:53 +00:00
commit 57cd6a8217
5 changed files with 10 additions and 22 deletions

View File

@ -59,8 +59,8 @@ public function map()
protected function mapWebRoutes() protected function mapWebRoutes()
{ {
Route::middleware('web') Route::middleware('web')
->namespace($this->namespace) ->namespace($this->namespace)
->group(base_path('routes/web.php')); ->group(base_path('routes/web.php'));
} }
/** /**
@ -73,8 +73,8 @@ protected function mapWebRoutes()
protected function mapApiRoutes() protected function mapApiRoutes()
{ {
Route::prefix('api') Route::prefix('api')
->middleware('api') ->middleware('api')
->namespace($this->namespace) ->namespace($this->namespace)
->group(base_path('routes/api.php')); ->group(base_path('routes/api.php'));
} }
} }

View File

@ -25,9 +25,9 @@
'allowed_headers' => ['*'], 'allowed_headers' => ['*'],
'exposed_headers' => false, 'exposed_headers' => [],
'max_age' => false, 'max_age' => 0,
'supports_credentials' => false, 'supports_credentials' => false,

View File

@ -55,6 +55,7 @@
'secret' => env('AWS_SECRET_ACCESS_KEY'), 'secret' => env('AWS_SECRET_ACCESS_KEY'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'), 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
'queue' => env('SQS_QUEUE', 'your-queue-name'), 'queue' => env('SQS_QUEUE', 'your-queue-name'),
'suffix' => env('SQS_SUFFIX'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
], ],

View File

@ -166,7 +166,7 @@
| |
*/ */
'secure' => env('SESSION_SECURE_COOKIE', null), 'secure' => env('SESSION_SECURE_COOKIE'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -190,7 +190,7 @@
| take place, and can be used to mitigate CSRF attacks. By default, we | take place, and can be used to mitigate CSRF attacks. By default, we
| do not enable this as other CSRF protection services are in place. | do not enable this as other CSRF protection services are in place.
| |
| Supported: "lax", "strict", "none" | Supported: "lax", "strict", "none", null
| |
*/ */

View File

@ -33,17 +33,4 @@
realpath(storage_path('framework/views')) realpath(storage_path('framework/views'))
), ),
/*
|--------------------------------------------------------------------------
| Blade View Modification Checking
|--------------------------------------------------------------------------
|
| On every request the framework will check to see if a view has expired
| to determine if it needs to be recompiled. If you are in production
| and precompiling views this feature may be disabled to save time.
|
*/
'expires' => env('VIEW_CHECK_EXPIRATION', true),
]; ];