diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-14 15:42:10 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-14 15:42:10 +0100 |
| commit | 302e855f52b5d914e64bf6fbcc7e6544904c4e77 (patch) | |
| tree | 10ec4d64d0136080685a8d93e5c0d0c324c54f23 /app/views/layouts/nav/_project.html.haml | |
| parent | 72fefba4c18e2464725231b3426ec2e3b0eda9c4 (diff) | |
| parent | 3c9318a8c58f638f57cfe86cb2f84625445996c8 (diff) | |
| download | gitlab-ce-302e855f52b5d914e64bf6fbcc7e6544904c4e77.tar.gz | |
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Diffstat (limited to 'app/views/layouts/nav/_project.html.haml')
| -rw-r--r-- | app/views/layouts/nav/_project.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 299dace3406..e34cddeb3e2 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -23,7 +23,7 @@ Registry - if project_nav_tab? :issues - = nav_link(controller: [:issues, :labels, :milestones, :boards]) do + = nav_link(controller: @project.default_issues_tracker? ? [:issues, :labels, :milestones, :boards] : :issues) do = link_to namespace_project_issues_path(@project.namespace, @project), title: 'Issues', class: 'shortcuts-issues' do %span Issues @@ -31,7 +31,7 @@ %span.badge.count.issue_counter= number_with_delimiter(IssuesFinder.new(current_user, project_id: @project.id).execute.opened.count) - if project_nav_tab? :merge_requests - = nav_link(controller: :merge_requests) do + = nav_link(controller: @project.default_issues_tracker? ? :merge_requests : [:merge_requests, :labels, :milestones]) do = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do %span Merge Requests |