Commit 38ad142f authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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

EE port 35659 Rename Pipelines tab to CI / CD in new navigation

See merge request !2582
parents c7837b50 114fb4d3
......@@ -91,8 +91,8 @@
Projects
= 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
Pipelines
CI / CD
= render "groups/ee/settings_nav"
......@@ -122,11 +122,11 @@
- if project_nav_tab? :pipelines
= 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
= custom_icon('pipeline')
%span.nav-item-name
Pipelines
CI / CD
%ul.sidebar-sub-level-items
- if project_nav_tab? :pipelines
......@@ -205,9 +205,9 @@
Repository
- if @project.feature_available?(:builds, current_user)
= 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
Pipelines
CI / CD
- if Gitlab.config.pages.enabled
= nav_link(controller: :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