From 6d0ac8496dea53c7771617ad3b08d943c2c96bff Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Sun, 6 Aug 2023 14:30:58 +0800 Subject: [PATCH] Upgraded `fleetbase/core-api` - Prevent mergeConfigFromSettings() from overwriting ENV variables --- api/config/filesystems.php | 1 - api/config/mail.php | 1 - packages/core-api | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/api/config/filesystems.php b/api/config/filesystems.php index bfc52131..4635a33f 100644 --- a/api/config/filesystems.php +++ b/api/config/filesystems.php @@ -56,7 +56,6 @@ return [ 'region' => env('AWS_DEFAULT_REGION'), 'bucket' => env('AWS_BUCKET'), 'url' => env('AWS_URL'), - 'endpoint' => env('AWS_BUCKET_ENDPOINT', env('AWS_ENDPOINT')), 'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false), ], diff --git a/api/config/mail.php b/api/config/mail.php index 7a0d652a..997ef5b3 100644 --- a/api/config/mail.php +++ b/api/config/mail.php @@ -50,7 +50,6 @@ return [ 'key' => env('AWS_ACCESS_KEY_ID'), 'secret' => env('AWS_SECRET_ACCESS_KEY'), 'region' => env('AWS_DEFAULT_REGION'), - 'version' => '2010-12-01' ], 'mailgun' => [ diff --git a/packages/core-api b/packages/core-api index b68858f5..f4aab71e 160000 --- a/packages/core-api +++ b/packages/core-api @@ -1 +1 @@ -Subproject commit b68858f563d4b0a77f89ac62bec5c6f78cf62309 +Subproject commit f4aab71e8c0873904999a48096733be66da72ef1