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

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/gitlab/bare_repository_import/importer.rb b/lib/gitlab/bare_repository_import/importer.rb
index ab7a08ffef9..44106897df8 100644
--- a/lib/gitlab/bare_repository_import/importer.rb
+++ b/lib/gitlab/bare_repository_import/importer.rb
@@ -13,7 +13,7 @@ module Gitlab
         repos_to_import = Dir.glob(import_path + '**/*.git')
 
         unless user = User.admins.order_id_asc.first
-          raise NoAdminError.new('No admin user found to import repositories')
+          raise NoAdminError, 'No admin user found to import repositories'
         end
 
         repos_to_import.each do |repo_path|
@@ -92,7 +92,7 @@ module Gitlab
         end
 
         true
-      rescue => e
+      rescue StandardError => e
         log " * Failed to move repo: #{e.message}".color(:red)
 
         false