Merge branch 'develop' into trunk

This commit is contained in:
Noah Lancien 2025-02-24 15:57:30 +01:00
commit ae2acc7135
3 changed files with 1 additions and 3 deletions

View file

@ -3,7 +3,6 @@ APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
APP_URL_FRONT=
LOG_CHANNEL=stack
LOG_LEVEL=debug

View file

@ -8,7 +8,6 @@ data:
APP_KEY: "${APP_APP_KEY}"
APP_DEBUG: "${APP_APP_DEBUG}"
APP_URL: "https://${APP_DOMAIN}"
APP_URL_FRONT: "${APP_APP_URL_FRONT}"
LOG_CHANNEL: "k8s"
LOG_LEVEL: "${APP_LOG_LEVEL}"
DB_HOST: "mariadb.common-services"

View file

@ -53,7 +53,7 @@
'id' => 'urlKey',
'settings' => $urlModel->image_settings ?? '',
'logo' => $urlModel->logo ?? '',
'baseUrlEnv' => env('APP_URL_FRONT')
'baseUrlEnv' => env('APP_URL')
]
@endphp
<div class="col-12">