diff options
author | Douwe Maan <me@douwe.me> | 2015-03-23 17:37:17 +0100 |
---|---|---|
committer | Marin Jankovski <maxlazio@gmail.com> | 2015-03-24 12:55:30 -0700 |
commit | 8a61111410d539a1c9aa1719af85da49be107da5 (patch) | |
tree | 21a214487a0e7535259c53fc7aaa34bbfbdbc10e | |
parent | 1b23122f999980f6725ad617cde44b582b663fdc (diff) | |
download | gitlab-ce-8a61111410d539a1c9aa1719af85da49be107da5.tar.gz |
Merge pull request #9001 from vichak/master
Fix #8966 Remove Milestones/Labels from project navbar when Issues disabled
-rw-r--r-- | app/helpers/projects_helper.rb | 4 | ||||
-rw-r--r-- | app/views/layouts/nav/_project.html.haml | 22 |
2 files changed, 16 insertions, 10 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 2225b110651..dd0669209cf 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -146,6 +146,10 @@ module ProjectsHelper nav_tabs << feature if project.send :"#{feature}_enabled" end + if project.issues_enabled + nav_tabs << [:milestones, :labels] + end + nav_tabs.flatten end diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index d340ab1796a..c58161c3362 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -44,11 +44,12 @@ %span Graphs - = nav_link(controller: :milestones) do - = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do - %i.fa.fa-clock-o - %span - Milestones + - if project_nav_tab? :milestones + = nav_link(controller: :milestones) do + = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do + %i.fa.fa-clock-o + %span + Milestones - if project_nav_tab? :issues = nav_link(controller: :issues) do @@ -67,11 +68,12 @@ Merge Requests %span.count.merge_counter= @project.merge_requests.opened.count - = nav_link(controller: :labels) do - = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do - %i.fa.fa-tags - %span - Labels + - if project_nav_tab? :labels + = nav_link(controller: :labels) do + = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do + %i.fa.fa-tags + %span + Labels - if project_nav_tab? :wiki = nav_link(controller: :wikis) do |