Commit 612b5a6f authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '35659-rename-pipeline' into 'master'

35659 Rename Pipelines tab to CI / CD in new navigation

Closes #35659

See merge request !13241
parents 59800e6d e9b079d0
...@@ -85,6 +85,6 @@ ...@@ -85,6 +85,6 @@
Projects Projects
= nav_link(controller: :ci_cd) do = nav_link(controller: :ci_cd) do
= link_to group_settings_ci_cd_path(@group), title: 'Pipelines' do = link_to group_settings_ci_cd_path(@group), title: 'CI / CD' do
%span %span
Pipelines CI / CD
...@@ -122,9 +122,9 @@ ...@@ -122,9 +122,9 @@
- if project_nav_tab? :pipelines - if project_nav_tab? :pipelines
= nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts]) do = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts]) do
= link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do = link_to project_pipelines_path(@project), title: 'CI / CD', class: 'shortcuts-pipelines' do
.nav-icon-container .nav-icon-container
= custom_icon('pipeline') = custom_icon('CI / CD')
%span.nav-item-name %span.nav-item-name
Pipelines Pipelines
...@@ -205,9 +205,9 @@ ...@@ -205,9 +205,9 @@
Repository Repository
- if @project.feature_available?(:builds, current_user) - if @project.feature_available?(:builds, current_user)
= nav_link(controller: :ci_cd) do = nav_link(controller: :ci_cd) do
= link_to project_settings_ci_cd_path(@project), title: 'Pipelines' do = link_to project_settings_ci_cd_path(@project), title: 'CI / CD' do
%span %span
Pipelines CI / CD
- if Gitlab.config.pages.enabled - if Gitlab.config.pages.enabled
= nav_link(controller: :pages) do = nav_link(controller: :pages) do
= link_to project_pages_path(@project), title: 'Pages' do = link_to project_pages_path(@project), title: 'Pages' do
......
---
title: Rename Pipelines tab to CI / CD in new navigation
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment