Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/jira_import/base_importer.rb b/lib/gitlab/jira_import/base_importer.rb
index 5fbdbbc08c1..5381812186d 100644
--- a/lib/gitlab/jira_import/base_importer.rb
+++ b/lib/gitlab/jira_import/base_importer.rb
@@ -6,10 +6,10 @@ module Gitlab
       attr_reader :project, :client, :formatter, :jira_project_key
 
       def initialize(project)
-        raise Projects::ImportService::Error, _('Jira import feature is disabled.') unless project.jira_issues_import_feature_flag_enabled?
-        raise Projects::ImportService::Error, _('Jira integration not configured.') unless project.jira_service&.active?
+        project.validate_jira_import_settings!
 
         @jira_project_key = project.latest_jira_import&.jira_project_key
+
         raise Projects::ImportService::Error, _('Unable to find Jira project to import data from.') unless @jira_project_key
 
         @project = project
diff --git a/lib/gitlab/jira_import/labels_importer.rb b/lib/gitlab/jira_import/labels_importer.rb
index 35c434e48a4..555a08d2c40 100644
--- a/lib/gitlab/jira_import/labels_importer.rb
+++ b/lib/gitlab/jira_import/labels_importer.rb
@@ -19,7 +19,7 @@ module Gitlab
 
       def cache_import_label(project)
         label = project.jira_imports.by_jira_project_key(jira_project_key).last.label
-        raise Projects::ImportService::Error, _('Failed to find import label for jira import.') unless label
+        raise Projects::ImportService::Error, _('Failed to find import label for Jira import.') unless label
 
         JiraImport.cache_import_label_id(project.id, label.id)
       end