Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

2 files changed, 6 insertions, 6 deletions

diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 2b28b30fd74..522a034a283 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -94,7 +94,7 @@ module Backup
               begin
                 FileUtils.rm(file)
                 removed += 1
-              rescue => e
+              rescue StandardError => e
                 progress.puts "Deleting #{file} failed: #{e.message}".color(:red)
               end
             end
diff --git a/lib/backup/repositories.rb b/lib/backup/repositories.rb
index 627bb44331b..b1231eebfcc 100644
--- a/lib/backup/repositories.rb
+++ b/lib/backup/repositories.rb
@@ -26,7 +26,7 @@ module Backup
         Thread.new do
           Rails.application.executor.wrap do
             dump_storage(storage, semaphore, max_storage_concurrency: max_storage_concurrency)
-          rescue => e
+          rescue StandardError => e
             errors << e
           end
         end
@@ -115,7 +115,7 @@ module Backup
 
               begin
                 dump_container(container)
-              rescue => e
+              rescue StandardError => e
                 errors << e
                 break
               ensure
@@ -260,7 +260,7 @@ module Backup
 
         progress.puts " * #{display_repo_path} ... " + "[DONE]".color(:green)
 
-      rescue => e
+      rescue StandardError => e
         progress.puts "[Failed] backing up #{display_repo_path}".color(:red)
         progress.puts "Error #{e}".color(:red)
       end
@@ -279,7 +279,7 @@ module Backup
 
         progress.puts " * #{display_repo_path} ... " + "[DONE]".color(:green)
 
-      rescue => e
+      rescue StandardError => e
         progress.puts "[Failed] restoring #{display_repo_path}".color(:red)
         progress.puts "Error #{e}".color(:red)
       end
@@ -329,4 +329,4 @@ module Backup
   end
 end
 
-Backup::Repositories.prepend_if_ee('EE::Backup::Repositories')
+Backup::Repositories.prepend_mod_with('Backup::Repositories')