Merge remote-tracking branch 'origin/main'

vanguardbackup · Jun 14, 2024 · 20725f2 · 20725f2
2 parents 70c8df3 + e728e62
commit 20725f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/Livewire/BackupTasks/DeleteBackupTaskLogButton.php b/app/Livewire/BackupTasks/DeleteBackupTaskLogButton.php
@@ -5,7 +5,6 @@
 use App\Models\BackupTaskLog;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\View\View;
 use Livewire\Component;
@@ -22,7 +21,7 @@ public function mount(BackupTaskLog $backupTaskLog): void
 
     public function delete(): RedirectResponse|Redirector
     {
-      $this->authorize('forceDelete', $this->backupTaskLog->backupTask);
+        $this->authorize('forceDelete', $this->backupTaskLog->backupTask);
 
         $this->backupTaskLog->forceDelete();
 

diff --git a/app/Models/BackupTask.php b/app/Models/BackupTask.php
@@ -213,7 +213,7 @@ public function run(): void
         }
 
         if ($this->isAnotherTaskRunningOnSameRemoteServer()) {
-            Log::debug('Another task is running on the same remote server, skipping run for task ' . $this->id . ' for now.');
+            Log::debug('Another task is running on the same remote server, skipping run for task '.$this->id.' for now.');
 
             return;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -213,7 +213,7 @@ public function run(): void @@
             }
             if ($this->isAnotherTaskRunningOnSameRemoteServer()) {
-                Log::debug('Another task is running on the same remote server, skipping run for task ' . $this->id . ' for now.');
+                Log::debug('Another task is running on the same remote server, skipping run for task '.$this->id.' for now.');
                 return;
             }
@@ Expand Down @@