diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-10 18:33:44 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-10 19:15:23 +0300 |
| commit | d4b2f5d0f3baf4e3644c0e0f71ffb2995fb72a57 (patch) | |
| tree | 8cb97a023bc00abb0fd1734521d95eceb478f684 /app | |
| parent | 1976a44649edcac40058cf39600e134ec6112408 (diff) | |
| download | gitlab-ce-d4b2f5d0f3baf4e3644c0e0f71ffb2995fb72a57.tar.gz | |
Render only issues/mr in subnav depends on context
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/nav/_project.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/issues/_head.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 9dc76fce9e1..79cc5c02888 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -63,7 +63,7 @@ Graphs - if project_nav_tab? :issues - = nav_link(controller: :issues) do + = nav_link(controller: [:issues, :labels, :milestones]) do = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do = navbar_icon('issues') %span diff --git a/app/views/projects/issues/_head.html.haml b/app/views/projects/issues/_head.html.haml index d0481be9932..583cc1b975b 100644 --- a/app/views/projects/issues/_head.html.haml +++ b/app/views/projects/issues/_head.html.haml @@ -1,12 +1,12 @@ %ul.nav-links.sub-nav %div{ class: (container_class) } - - if project_nav_tab?(:issues) + - if project_nav_tab?(:issues) && current_controller?(:issues) = nav_link(controller: :issues) do = link_to url_for_project_issues(@project, only_path: true), title: 'Issues' do %span Issues - - if project_nav_tab?(:merge_requests) + - if project_nav_tab?(:merge_requests) && current_controller?(:merge_requests) = nav_link(controller: :merge_requests) do = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests' do %span |