diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-04 15:00:30 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-04 15:00:30 +0000 |
| commit | 612b5a6fd7318e5909c3d9a16ec548637d8f6f75 (patch) | |
| tree | 2c02044b14310bc7b8a886b0bc4bf9abc7ac4155 | |
| parent | 59800e6deb23b14824c92732c3c6344cbe33b13c (diff) | |
| parent | e9b079d023df7df1b4aca051a1e347b1a8ad810a (diff) | |
| download | gitlab-ce-612b5a6fd7318e5909c3d9a16ec548637d8f6f75.tar.gz | |
Merge branch '35659-rename-pipeline' into 'master'
35659 Rename Pipelines tab to CI / CD in new navigation
Closes #35659
See merge request !13241
| -rw-r--r-- | app/views/layouts/nav/_new_group_sidebar.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/nav/_new_project_sidebar.html.haml | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/35659-rename-pipeline.yml | 4 |
3 files changed, 10 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 diff --git a/changelogs/unreleased/35659-rename-pipeline.yml b/changelogs/unreleased/35659-rename-pipeline.yml new file mode 100644 index 00000000000..0fe211868e4 --- /dev/null +++ b/changelogs/unreleased/35659-rename-pipeline.yml @@ -0,0 +1,4 @@ +--- +title: Rename Pipelines tab to CI / CD in new navigation +merge_request: +author: |