summaryrefslogtreecommitdiff
path: root/lib/gitlab/ldap/adapter.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/ldap/adapter.rb')
-rw-r--r--lib/gitlab/ldap/adapter.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb
index 8b38cfaefb6..7b05290e5cc 100644
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@@ -89,9 +89,7 @@ module Gitlab
end
def user_filter(filter = nil)
- if config.user_filter.present?
- user_filter = Net::LDAP::Filter.construct(config.user_filter)
- end
+ user_filter = config.constructed_user_filter if config.user_filter.present?
if user_filter && filter
Net::LDAP::Filter.join(filter, user_filter)