diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-04 19:07:29 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-04 19:07:29 +0000 |
| commit | 0b10259140a2114bfbd58a2257c32a6317394afe (patch) | |
| tree | 17ccd15d7863caf97548a9e1466214b2afe043aa | |
| parent | 17342953dd8d98e85ea79025ffd93a051f786413 (diff) | |
| parent | ff99e87e9aa54dac07a3cd90fa91f4bcb2355f91 (diff) | |
| download | gitlab-ce-0b10259140a2114bfbd58a2257c32a6317394afe.tar.gz | |
Merge branch 'fix-pipeline-icon-contextual-nav' into 'master'
Fix pipeline icon in contextual nav for projects
See merge request !13324
| -rw-r--r-- | app/views/layouts/nav/_new_project_sidebar.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml index 8d821c1796c..673febbc798 100644 --- a/app/views/layouts/nav/_new_project_sidebar.html.haml +++ b/app/views/layouts/nav/_new_project_sidebar.html.haml @@ -124,9 +124,9 @@ = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts]) do = link_to project_pipelines_path(@project), title: 'CI / CD', class: 'shortcuts-pipelines' do .nav-icon-container - = custom_icon('CI / CD') + = custom_icon('pipeline') %span.nav-item-name - Pipelines + CI / CD %ul.sidebar-sub-level-items - if project_nav_tab? :pipelines |