summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authortauriedavis <taurie@gitlab.com>2017-08-01 15:13:39 -0700
committertauriedavis <taurie@gitlab.com>2017-08-03 20:34:25 -0700
commite9b079d023df7df1b4aca051a1e347b1a8ad810a (patch)
tree528cfe1742729e45b6a4fb2e1482233fcce0bc8c /app
parent93e96c3fcf30c476df332a7e5e762134ffb5da3e (diff)
downloadgitlab-ce-e9b079d023df7df1b4aca051a1e347b1a8ad810a.tar.gz
35659 Rename Pipelines tab to CI / CD in new navigation35659-rename-pipeline
Diffstat (limited to 'app')
-rw-r--r--app/views/layouts/nav/_new_group_sidebar.html.haml4
-rw-r--r--app/views/layouts/nav/_new_project_sidebar.html.haml8
2 files changed, 6 insertions, 6 deletions
diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml
index fdfd7e60732..33a83866cbf 100644
--- a/app/views/layouts/nav/_new_group_sidebar.html.haml
+++ b/app/views/layouts/nav/_new_group_sidebar.html.haml
@@ -85,6 +85,6 @@
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
diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml
index 9f1cb248c4e..8e246b6e91f 100644
--- a/app/views/layouts/nav/_new_project_sidebar.html.haml
+++ b/app/views/layouts/nav/_new_project_sidebar.html.haml
@@ -122,9 +122,9 @@
- 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')
+ = custom_icon('CI / CD')
%span.nav-item-name
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