dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'next' into feat-db-ssl

Browse Source
This commit is contained in:
Andras Bacsai
2025-03-17 15:15:24 +01:00
committed by GitHub
parent 8ebbe396f4 c9d8820b83
commit 009cee1bbd
117 changed files with 4584 additions and 1786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Notifications/Application/DeploymentSuccess.php
View File

@@ -44,7 +44,7 @@ class DeploymentSuccess extends CustomEmailNotification
if (str($this->fqdn)->explode(',')->count() > 1) {
$this->fqdn = str($this->fqdn)->explode(',')->first();
}
$this->deployment_url = base_url()."/project/{$this->project_uuid}/environments/{$this->environment_uuid}/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}";
$this->deployment_url = base_url()."/project/{$this->project_uuid}/environment/{$this->environment_uuid}/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}";
}
public function via(object $notifiable): array

2
app/Notifications/Application/StatusChanged.php
View File

@@ -34,7 +34,7 @@ class StatusChanged extends CustomEmailNotification
if (str($this->fqdn)->explode(',')->count() > 1) {
$this->fqdn = str($this->fqdn)->explode(',')->first();
}
$this->resource_url = base_url()."/project/{$this->project_uuid}/environments/{$this->environment_uuid}/application/{$this->resource->uuid}";
$this->resource_url = base_url()."/project/{$this->project_uuid}/environment/{$this->environment_uuid}/application/{$this->resource->uuid}";
}
public function via(object $notifiable): array

3
app/Notifications/Channels/EmailChannel.php
View File

@@ -50,10 +50,9 @@ class EmailChannel
if ($emailSettings->use_instance_email_settings) {
$type = set_transanctional_email_settings();
if (! $type) {
if (blank($type)) {
throw new Exception('No email settings found.');
}
config()->set('mail.default', $type);
return;
}

2
app/Notifications/Channels/TransactionalEmailChannel.php
View File

@@ -35,7 +35,7 @@ class TransactionalEmailChannel
private function bootConfigs(): void
{
$type = set_transanctional_email_settings();
if (! $type) {
if (blank($type)) {
throw new Exception('No email settings found.');
}
}

2
app/Notifications/Dto/PushoverMessage.php
View File

@@ -40,7 +40,7 @@ class PushoverMessage
if ($buttonUrl && str_contains($buttonUrl, 'http://localhost')) {
$buttonUrl = str_replace('http://localhost', config('app.url'), $buttonUrl);
}
$payload['message'] .= "&nbsp;<a href='" . $buttonUrl . "'>" . $text . '</a>';
$payload['message'] .= "&nbsp;<a href='".$buttonUrl."'>".$text.'</a>';
}
Log::info('Pushover message', $payload);

5
app/Notifications/TransactionalEmails/ResetPassword.php
View File

@@ -3,6 +3,7 @@
namespace App\Notifications\TransactionalEmails;
use App\Models\InstanceSettings;
use Exception;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
@@ -35,8 +36,8 @@ class ResetPassword extends Notification
public function via($notifiable)
{
$type = set_transanctional_email_settings();
if (! $type) {
throw new \Exception('No email settings found.');
if (blank($type)) {
throw new Exception('No email settings found.');
}
return ['mail'];