Commit ceaa2f5c authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge pull request #9001 from vichak/master 

Fix #8966 Remove Milestones/Labels from project navbar when Issues disabled
parents d4d0852d e5b8cf0a

app/helpers/projects_helper.rb

+4 −0
Original line number Diff line number Diff line
@@ -146,6 +146,10 @@ def get_project_nav_tabs(project, current_user) 
      nav_tabs << feature if project.send :"#{feature}_enabled"

    end



    if project.issues_enabled

      nav_tabs << [:milestones, :labels]

    end



    nav_tabs.flatten

  end

app/views/layouts/nav/_project.html.haml

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
          %span

            Graphs



    - 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
@@ -67,6 +68,7 @@ 
            Merge Requests

            %span.count.merge_counter= @project.merge_requests.opened.count



    - 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