Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 902eb8f6659..a8b3c12a2a2 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -396,13 +396,13 @@ module Backup
 
           timestamp = matched[1].to_i
 
-          if Time.at(timestamp) < (Time.now - keep_time)
-            begin
-              FileUtils.rm(file)
-              removed += 1
-            rescue StandardError => e
-              puts_time "Deleting #{file} failed: #{e.message}".color(:red)
-            end
+          next unless Time.at(timestamp) < (Time.now - keep_time)
+
+          begin
+            FileUtils.rm(file)
+            removed += 1
+          rescue StandardError => e
+            puts_time "Deleting #{file} failed: #{e.message}".color(:red)
           end
         end
       end