diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-05-19 20:42:43 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-05-19 20:42:43 +0000 |
| commit | bd0cecfdf6ec504421b44f1174040c5003c13f65 (patch) | |
| tree | 200c89a047765c7578bc34c16065d8b2ee81980a /app/views/layouts/nav | |
| parent | 53e2d30af4f5a23d4f58c051293188e891c385fa (diff) | |
| parent | 4f1c63683175fa88ca41ba2180b68e266d7118e4 (diff) | |
| download | gitlab-ce-bd0cecfdf6ec504421b44f1174040c5003c13f65.tar.gz | |
Merge branch 'with-pipeline-view' into 'master'
Add pipeline view
This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653
cc @DouweM @grzesiek
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625
See merge request !3703
Diffstat (limited to 'app/views/layouts/nav')
| -rw-r--r-- | app/views/layouts/nav/_project.html.haml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index d3d715aad3b..a97fefcfb46 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -39,6 +39,13 @@ Commits - if project_nav_tab? :builds + = nav_link(controller: :pipelines) do + = link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do + = icon('ship fw') + %span + Pipelines + %span.count.ci_counter= number_with_delimiter(@project.ci_commits.running_or_pending.count) + = nav_link(controller: %w(builds)) do = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do = icon('cubes fw') |