Merge branch 'update-cicd-naming' into 'master'

Update UI to use CI/CD without spaces

See merge request gitlab-org/gitlab!56070

app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue

@@ -292,7 +292,7 @@ export default {
       failure.text
     }}</gl-alert>
     <div class="gl-mb-3">
-      <h3>{{ s__('PipelineCharts|CI / CD Analytics') }}</h3>
+      <h3>{{ s__('PipelineCharts|CI/CD Analytics') }}</h3>
     </div>
     <h4 class="gl-my-4">{{ s__('PipelineCharts|Overall statistics') }}</h4>
     <div class="row">

app/helpers/analytics/navbar_helper.rb

@@ -58,7 +58,7 @@ module Analytics
       return unless project.feature_available?(:builds, current_user) || !project.empty_repo?
 
       navbar_sub_item(
-        title: _('CI / CD'),
+        title: _('CI/CD'),
         path: 'pipelines#charts',
         link: charts_project_pipelines_path(project)
       )

app/views/groups/settings/ci_cd/show.html.haml

-- breadcrumb_title _("CI / CD Settings")
-- page_title _("CI / CD")
+- breadcrumb_title _("CI/CD Settings")
+- page_title _("CI/CD")
 
 - expanded = expanded_by_default?
 - general_expanded = @group.errors.empty? ? expanded : true

app/views/layouts/nav/sidebar/_group.html.haml

@@ -171,9 +171,9 @@
                   = _('Repository')
 
             = nav_link(controller: :ci_cd) do
-              = link_to group_settings_ci_cd_path(@group), title: _('CI / CD') do
+              = link_to group_settings_ci_cd_path(@group), title: _('CI/CD') do
                 %span
-                  = _('CI / CD')
+                  = _('CI/CD')
 
             = render 'groups/sidebar/packages_settings'
 

app/views/layouts/nav/sidebar/_project.html.haml

@@ -179,13 +179,13 @@
             .nav-icon-container
               = sprite_icon('rocket')
             %span.nav-item-name#js-onboarding-pipelines-link
-              = _('CI / CD')
+              = _('CI/CD')
 
           %ul.sidebar-sub-level-items
             = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :artifacts, :test_cases, :pipeline_editor], html_options: { class: "fly-out-top-item" }) do
               = link_to project_pipelines_path(@project) do
                 %strong.fly-out-top-item-name
-                  =  _('CI / CD')
+                  =  _('CI/CD')
             %li.divider.fly-out-top-item
             - if project_nav_tab? :pipelines
               = nav_link(path: ['pipelines#index', 'pipelines#show']) do
@@ -418,9 +418,9 @@
                     = _('Repository')
               - if !@project.archived? && @project.feature_available?(:builds, current_user)
                 = nav_link(controller: :ci_cd) do
-                  = link_to project_settings_ci_cd_path(@project), title: _('CI / CD') do
+                  = link_to project_settings_ci_cd_path(@project), title: _('CI/CD') do
                     %span
-                      = _('CI / CD')
+                      = _('CI/CD')
               - if settings_operations_available?
                 = nav_link(controller: [:operations]) do
                   = link_to project_settings_operations_path(@project), title: _('Operations'), data: { qa_selector: 'operations_settings_link' } do

app/views/projects/pipelines/charts.html.haml

-- page_title _('CI / CD Analytics')
+- page_title _('CI/CD Analytics')
 
 #js-project-pipelines-charts-app{ data: { project_path: @project.full_path,
   should_render_deployment_frequency_charts: should_render_deployment_frequency_charts.to_s } }

app/views/projects/settings/ci_cd/show.html.haml

 - @content_class = "limit-container-width" unless fluid_layout
-- page_title _("CI / CD Settings")
-- page_title _("CI / CD")
+- page_title _("CI/CD Settings")
+- page_title _("CI/CD")
 
 - expanded = expanded_by_default?
 - general_expanded = @project.errors.empty? ? expanded : true

changelogs/unreleased/update-cicd-naming.yml

+---
+title: Update UI text to CI/CD from CI / CD
+merge_request: 56070
+author:
+type: other

ee/app/helpers/ee/analytics/navbar_helper.rb

@@ -132,7 +132,7 @@ module EE
         return unless group_sidebar_link?(:group_ci_cd_analytics)
 
         navbar_sub_item(
-          title: _('CI / CD'),
+          title: _('CI/CD'),
           path: 'groups/analytics/ci_cd_analytics#show',
           link: group_analytics_ci_cd_analytics_path(group)
         )

ee/app/views/groups/analytics/ci_cd_analytics/show.html.haml

-- page_title _("CI / CD Analytics")
+- page_title _("CI/CD Analytics")
 
 #js-group-ci-cd-analytics-app{ data: { full_path: @group.full_path } }

ee/spec/helpers/ee/groups_helper_spec.rb

@@ -91,19 +91,19 @@ RSpec.describe GroupsHelper do
         stub_feature_flags(group_ci_cd_analytics_page: false)
       end
 
-      it 'hides CI / CD Analytics' do
+      it 'hides CI/CD Analytics' do
         expect(helper.group_sidebar_links).not_to include(:group_ci_cd_analytics)
       end
     end
 
-    context 'when the user does not have permissions to view the CI / CD Analytics page' do
+    context 'when the user does not have permissions to view the CI/CD Analytics page' do
       let(:current_user) { create(:user) }
 
       before do
         group.add_guest(current_user)
       end
 
-      it 'hides CI / CD Analytics' do
+      it 'hides CI/CD Analytics' do
         expect(helper.group_sidebar_links).not_to include(:group_ci_cd_analytics)
       end
     end

ee/spec/policies/group_policy_spec.rb

@@ -232,8 +232,8 @@ RSpec.describe GroupPolicy do
     it { is_expected.not_to be_allowed(:read_group_activity_analytics) }
   end
 
-  context 'group CI / CD analytics' do
-    context 'when group CI / CD analytics is available' do
+  context 'group CI/CD analytics' do
+    context 'when group CI/CD analytics is available' do
       before do
         stub_licensed_features(group_ci_cd_analytics: true)
       end
@@ -251,7 +251,7 @@ RSpec.describe GroupPolicy do
       end
     end
 
-    context 'when group CI / CD analytics is not available' do
+    context 'when group CI/CD analytics is not available' do
       let(:current_user) { reporter }
 
       before do

locale/gitlab.pot

@@ -5207,15 +5207,6 @@ msgstr ""
 msgid "CHANGELOG"
 msgstr ""
 
-msgid "CI / CD"
-msgstr ""
-
-msgid "CI / CD Analytics"
-msgstr ""
-
-msgid "CI / CD Settings"
-msgstr ""
-
 msgid "CI Lint"
 msgstr ""
 
@@ -5234,6 +5225,12 @@ msgstr ""
 msgid "CI/CD"
 msgstr ""
 
+msgid "CI/CD Analytics"
+msgstr ""
+
+msgid "CI/CD Settings"
+msgstr ""
+
 msgid "CI/CD configuration"
 msgstr ""
 
@@ -22156,7 +22153,7 @@ msgstr ""
 msgid "PipelineCharts|An unknown error occurred while processing CI/CD analytics."
 msgstr ""
 
-msgid "PipelineCharts|CI / CD Analytics"
+msgid "PipelineCharts|CI/CD Analytics"
 msgstr ""
 
 msgid "PipelineCharts|Failed:"

qa/qa/page/project/sub_menus/settings.rb

@@ -25,7 +25,7 @@ module QA
           def go_to_ci_cd_settings
             hover_settings do
               within_submenu do
-                click_link('CI / CD')
+                click_link('CI/CD')
               end
             end
           end

spec/features/projects/active_tabs_spec.rb

@@ -132,13 +132,13 @@ RSpec.describe 'Project active tab' do
       it_behaves_like 'page has active sub tab', _('Value Stream')
     end
 
-    context 'on project Analytics/"CI / CD"' do
+    context 'on project Analytics/"CI/CD"' do
       before do
-        click_tab(_('CI / CD'))
+        click_tab(_('CI/CD'))
       end
 
       it_behaves_like 'page has active tab', _('Analytics')
-      it_behaves_like 'page has active sub tab', _('CI / CD')
+      it_behaves_like 'page has active sub tab', _('CI/CD')
     end
   end
 end

spec/features/projects/user_sees_sidebar_spec.rb

@@ -201,7 +201,7 @@ RSpec.describe 'Projects > User sees sidebar' do
         expect(page).to have_content 'Operations'
 
         expect(page).not_to have_content 'Repository'
-        expect(page).not_to have_content 'CI / CD'
+        expect(page).not_to have_content 'CI/CD'
         expect(page).not_to have_content 'Merge Requests'
       end
     end
@@ -213,7 +213,7 @@ RSpec.describe 'Projects > User sees sidebar' do
       visit project_path(project)
 
       within('.nav-sidebar') do
-        expect(page).to have_content 'CI / CD'
+        expect(page).to have_content 'CI/CD'
       end
     end
 

spec/features/projects/user_uses_shortcuts_spec.rb

@@ -155,12 +155,12 @@ RSpec.describe 'User uses shortcuts', :js do
     end
   end
 
-  context 'when navigating to the CI / CD pages' do
+  context 'when navigating to the CI/CD pages' do
     it 'redirects to the Jobs page' do
       find('body').native.send_key('g')
       find('body').native.send_key('j')
 
-      expect(page).to have_active_navigation('CI / CD')
+      expect(page).to have_active_navigation('CI/CD')
       expect(page).to have_active_sub_navigation('Jobs')
     end
   end

spec/support/shared_contexts/navbar_structure_context.rb

@@ -5,7 +5,7 @@ RSpec.shared_context 'project navbar structure' do
     {
       nav_item: _('Analytics'),
       nav_sub_items: [
-        _('CI / CD'),
+        _('CI/CD'),
         (_('Code Review') if Gitlab.ee?),
         (_('Merge Request') if Gitlab.ee?),
         _('Repository'),
@@ -63,7 +63,7 @@ RSpec.shared_context 'project navbar structure' do
         nav_sub_items: []
       },
       {
-        nav_item: _('CI / CD'),
+        nav_item: _('CI/CD'),
         nav_sub_items: [
           _('Pipelines'),
           s_('Pipelines|Editor'),
@@ -111,7 +111,7 @@ RSpec.shared_context 'project navbar structure' do
           _('Webhooks'),
           _('Access Tokens'),
           _('Repository'),
-          _('CI / CD'),
+          _('CI/CD'),
           _('Operations')
         ].compact
       }
@@ -138,7 +138,7 @@ RSpec.shared_context 'group navbar structure' do
         _('Integrations'),
         _('Projects'),
         _('Repository'),
-        _('CI / CD'),
+        _('CI/CD'),
         _('Packages & Registries'),
         _('Webhooks')
       ]

spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb

@@ -204,7 +204,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
       it 'does not show the ci/cd settings tab' do
         render
 
-        expect(rendered).not_to have_link('CI / CD', href: project_settings_ci_cd_path(project))
+        expect(rendered).not_to have_link('CI/CD', href: project_settings_ci_cd_path(project))
       end
     end
 
@@ -214,7 +214,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
       it 'shows the ci/cd settings tab' do
         render
 
-        expect(rendered).to have_link('CI / CD', href: project_settings_ci_cd_path(project))
+        expect(rendered).to have_link('CI/CD', href: project_settings_ci_cd_path(project))
       end
     end
   end