Merge branch 'master' of github.com:gitlabhq/gitlabhq

3 files changed, 16 insertions, 11 deletions

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index a14277180c7..77ad7a40fab 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 91cae2b572c..52681865d64 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
diff --git a/lib/gitlab/ldap/person.rb b/lib/gitlab/ldap/person.rb
index 3c426179375..b81f3e8e8f5 100644
--- a/lib/gitlab/ldap/person.rb
+++ b/lib/gitlab/ldap/person.rb
@@ -14,7 +14,6 @@ module Gitlab
       end
 
       def self.find_by_dn(dn, adapter)
-        dn = Net::LDAP::Filter.escape(dn)
         adapter.user('dn', dn)
       end