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

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
 

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

@@ -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

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