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

3 files changed, 3 insertions, 3 deletions

diff --git a/app/controllers/import/base_controller.rb b/app/controllers/import/base_controller.rb
index 87cda723895..1121ecfb65c 100644
--- a/app/controllers/import/base_controller.rb
+++ b/app/controllers/import/base_controller.rb
@@ -97,7 +97,7 @@ class Import::BaseController < ApplicationController
     group = Groups::NestedCreateService.new(current_user, group_path: names).execute
 
     group.errors.any? ? current_user.namespace : group
-  rescue => e
+  rescue StandardError => e
     Gitlab::AppLogger.error(e)
 
     current_user.namespace
diff --git a/app/controllers/import/fogbugz_controller.rb b/app/controllers/import/fogbugz_controller.rb
index 17f937a3dfd..9f91f3a1e1c 100644
--- a/app/controllers/import/fogbugz_controller.rb
+++ b/app/controllers/import/fogbugz_controller.rb
@@ -15,7 +15,7 @@ class Import::FogbugzController < Import::BaseController
   def callback
     begin
       res = Gitlab::FogbugzImport::Client.new(import_params.to_h.symbolize_keys)
-    rescue
+    rescue StandardError
       # If the URI is invalid various errors can occur
       return redirect_to new_import_fogbugz_path, alert: _('Could not connect to FogBugz, check your URL')
     end
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index beb3e92b5ea..22bcd14d664 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -265,4 +265,4 @@ class Import::GithubController < Import::BaseController
   end
 end
 
-Import::GithubController.prepend_if_ee('EE::Import::GithubController')
+Import::GithubController.prepend_mod_with('Import::GithubController')