Commit 78fe7270 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents 66e39992 ceaa2f5c
...@@ -146,6 +146,10 @@ module ProjectsHelper ...@@ -146,6 +146,10 @@ module ProjectsHelper
nav_tabs << feature if project.send :"#{feature}_enabled" nav_tabs << feature if project.send :"#{feature}_enabled"
end end
if project.issues_enabled
nav_tabs << [:milestones, :labels]
end
nav_tabs.flatten nav_tabs.flatten
end end
......
...@@ -44,11 +44,12 @@ ...@@ -44,11 +44,12 @@
%span %span
Graphs Graphs
= nav_link(controller: :milestones) do - if project_nav_tab? :milestones
= link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do = nav_link(controller: :milestones) do
%i.fa.fa-clock-o = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
%span %i.fa.fa-clock-o
Milestones %span
Milestones
- if project_nav_tab? :issues - if project_nav_tab? :issues
= nav_link(controller: :issues) do = nav_link(controller: :issues) do
...@@ -67,11 +68,12 @@ ...@@ -67,11 +68,12 @@
Merge Requests Merge Requests
%span.count.merge_counter= @project.merge_requests.opened.count %span.count.merge_counter= @project.merge_requests.opened.count
= nav_link(controller: :labels) do - if project_nav_tab? :labels
= link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do = nav_link(controller: :labels) do
%i.fa.fa-tags = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
%span %i.fa.fa-tags
Labels %span
Labels
- if project_nav_tab? :wiki - if project_nav_tab? :wiki
= nav_link(controller: :wikis) do = nav_link(controller: :wikis) do
......
...@@ -14,7 +14,6 @@ module Gitlab ...@@ -14,7 +14,6 @@ module Gitlab
end end
def self.find_by_dn(dn, adapter) def self.find_by_dn(dn, adapter)
dn = Net::LDAP::Filter.escape(dn)
adapter.user('dn', dn) adapter.user('dn', dn)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment