Skip to content

Commit

Permalink
Merge pull request #2090 from coollabsio/next
Browse files Browse the repository at this point in the history
v4.0.0-beta.270
  • Loading branch information
andrasbacsai committed Apr 28, 2024
2 parents 249f35f + 714b887 commit 094dfde
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/Models/StandaloneMongodb.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,6 @@ public function scheduledBackups()
return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
}
public function database_name() {
return $this->mongo_db;
return null;
}
}
2 changes: 1 addition & 1 deletion app/Notifications/Database/BackupFailed.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class BackupFailed extends Notification implements ShouldQueue

public $tries = 1;
public string $name;
public string $database_name;
public ?string $database_name = null;
public string $frequency;

public function __construct(ScheduledDatabaseBackup $backup, public $database, public $output)
Expand Down
2 changes: 1 addition & 1 deletion app/Notifications/Database/BackupSuccess.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class BackupSuccess extends Notification implements ShouldQueue

public $tries = 1;
public string $name;
public string $database_name;
public ?string $database_name = null;
public string $frequency;

public function __construct(ScheduledDatabaseBackup $backup, public $database)
Expand Down
2 changes: 1 addition & 1 deletion config/sentry.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

// The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.269',
'release' => '4.0.0-beta.270',
// When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'),

Expand Down
2 changes: 1 addition & 1 deletion config/version.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

return '4.0.0-beta.269';
return '4.0.0-beta.270';
2 changes: 1 addition & 1 deletion resources/views/emails/backup-failed.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<x-emails.layout>
Database backup for {{ $name }} (db:{{$database_name}}) with frequency of {{ $frequency }} was FAILED.
Database backup for {{ $name }} @if($database_name)(db:{{ $database_name }})@endif with frequency of {{ $frequency }} was FAILED.

### Reason

Expand Down
2 changes: 1 addition & 1 deletion resources/views/emails/backup-success.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<x-emails.layout>
Database backup for {{ $name }} (db:{{ $database_name }}) with frequency of {{ $frequency }} was successful.
Database backup for {{ $name }} @if($database_name)(db:{{ $database_name }})@endif with frequency of {{ $frequency }} was successful.
</x-emails.layout>
2 changes: 1 addition & 1 deletion versions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"coolify": {
"v4": {
"version": "4.0.0-beta.269"
"version": "4.0.0-beta.270"
}
}
}
Expand Down

0 comments on commit 094dfde

Please sign in to comment.