Skip to content

G
gitlab-ce
Commit c862bc6f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge branch 'ldap_user_filter_fix' into 'master' 

LDAP user filter fix
parents cb4b504b 7dfb678d
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
config/initializers/devise.rb
View file @ c862bc6f
...@@ -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
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7