Merge branch 'cablett-consistent-jira-ui' into 'master'

Make Jira capitalisation consistent (user-facing)

See merge request gitlab-org/gitlab!29875

app/controllers/projects/import/jira_controller.rb

@@ -36,7 +36,7 @@ module Projects
           response = ::JiraImport::StartImportService.new(current_user, @project, jira_project_key).execute
           flash[:notice] = response.message if response.message.present?
         else
-          flash[:alert] = 'No jira project key has been provided.'
+          flash[:alert] = 'No Jira project key has been provided.'
         end
 
         redirect_to project_import_jira_path(@project)

app/services/jira_import/start_import_service.rb

@@ -56,7 +56,7 @@ module JiraImport
       import_start_time = Time.zone.now
       jira_imports_for_project = project.jira_imports.by_jira_project_key(jira_project_key).size + 1
       title = "jira-import::#{jira_project_key}-#{jira_imports_for_project}"
-      description = "Label for issues that were imported from jira on #{import_start_time.strftime('%Y-%m-%d %H:%M:%S')}"
+      description = "Label for issues that were imported from Jira on #{import_start_time.strftime('%Y-%m-%d %H:%M:%S')}"
       color = "#{Label.color_for(title)}"
       { title: title, description: description, color: color }
     end

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

locale/gitlab.pot

@@ -8759,7 +8759,7 @@ msgstr ""
 msgid "Failed to enqueue the rebase operation, possibly due to a long-lived transaction. Try again later."
 msgstr ""
 
-msgid "Failed to find import label for jira import."
+msgid "Failed to find import label for Jira import."
 msgstr ""
 
 msgid "Failed to get ref."

spec/controllers/projects/import/jira_controller_spec.rb

@@ -152,7 +152,7 @@ describe Projects::Import::JiraController do
                 post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: '' }
 
                 expect(response).to redirect_to(project_import_jira_path(project))
-                expect(flash[:alert]).to eq('No jira project key has been provided.')
+                expect(flash[:alert]).to eq('No Jira project key has been provided.')
               end
             end
 

spec/lib/gitlab/jira_import/labels_importer_spec.rb

@@ -18,7 +18,7 @@ describe Gitlab::JiraImport::LabelsImporter do
       let_it_be(:no_label_jira_import) { create(:jira_import_state, label: nil, project: project) }
 
       it 'raises error' do
-        expect { subject }.to raise_error(Projects::ImportService::Error, 'Failed to find import label for jira import.')
+        expect { subject }.to raise_error(Projects::ImportService::Error, 'Failed to find import label for Jira import.')
       end
     end