Commit d5ae2bfc authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'fix_ldap_user_filter' into '6-9-stable'

Fix LDAP user filter
parents 13202d82 6d896ed5
...@@ -223,7 +223,6 @@ Devise.setup do |config| ...@@ -223,7 +223,6 @@ Devise.setup do |config|
method: Gitlab.config.ldap['method'], method: Gitlab.config.ldap['method'],
bind_dn: Gitlab.config.ldap['bind_dn'], bind_dn: Gitlab.config.ldap['bind_dn'],
password: Gitlab.config.ldap['password'], password: Gitlab.config.ldap['password'],
filter: Gitlab.config.ldap['user_filter'],
name_proc: email_stripping_proc name_proc: email_stripping_proc
end end
...@@ -245,4 +244,4 @@ Devise.setup do |config| ...@@ -245,4 +244,4 @@ Devise.setup do |config|
config.omniauth provider['name'].to_sym, *provider_arguments config.omniauth provider['name'].to_sym, *provider_arguments
end end
end end
\ No newline at end of file
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