summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-23 09:44:20 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-23 09:44:20 -0700
commit78fe7270ab13b8d12d2de46488a37993a11029f6 (patch)
treebdb9c37730ffebc540ad3b9ccca472b478d24e96 /lib
parent66e39992873e56e077b124decae17e7f24569be1 (diff)
parentceaa2f5c26ecab973922bf70ebdaadc5c2806d32 (diff)
downloadgitlab-ce-78fe7270ab13b8d12d2de46488a37993a11029f6.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ldap/person.rb1
1 files changed, 0 insertions, 1 deletions
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