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

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/gitlab/jira_import/issues_importer.rb b/lib/gitlab/jira_import/issues_importer.rb
index 26fa01755d1..8a03162f111 100644
--- a/lib/gitlab/jira_import/issues_importer.rb
+++ b/lib/gitlab/jira_import/issues_importer.rb
@@ -70,7 +70,7 @@ module Gitlab
             # These ids are cleaned-up when import finishes.
             # see Gitlab::JiraImport::Stage::FinishImportWorker
             mark_as_imported(jira_issue.id)
-          rescue => ex
+          rescue StandardError => ex
             # handle exceptionn here and skip the failed to import issue, instead of
             # failing to import the entire batch of issues
 
diff --git a/lib/gitlab/jira_import/labels_importer.rb b/lib/gitlab/jira_import/labels_importer.rb
index 6e6842e06bf..046dc3fd04f 100644
--- a/lib/gitlab/jira_import/labels_importer.rb
+++ b/lib/gitlab/jira_import/labels_importer.rb
@@ -47,7 +47,7 @@ module Gitlab
         Gitlab::JiraImport::HandleLabelsService.new(project, response['values']).execute
 
         response['isLast']
-      rescue => e
+      rescue StandardError => e
         Gitlab::ErrorTracking.track_exception(e, project_id: project.id, request: request)
       end
     end