summaryrefslogtreecommitdiff
path: root/lib/gitlab/ldap/authentication.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/ldap/authentication.rb')
-rw-r--r--lib/gitlab/ldap/authentication.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/gitlab/ldap/authentication.rb b/lib/gitlab/ldap/authentication.rb
index bad683c6511..4745311402c 100644
--- a/lib/gitlab/ldap/authentication.rb
+++ b/lib/gitlab/ldap/authentication.rb
@@ -54,11 +54,9 @@ module Gitlab
# Apply LDAP user filter if present
if config.user_filter.present?
- filter = Net::LDAP::Filter.join(
- filter,
- Net::LDAP::Filter.construct(config.user_filter)
- )
+ filter = Net::LDAP::Filter.join(filter, config.constructed_user_filter)
end
+
filter
end