mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-17 00:26:07 +10:00
Merge branch 'fix_ldap_user_filter' into '6-9-stable'
Fix LDAP user filter
This commit is contained in:
@@ -223,7 +223,6 @@ Devise.setup do |config|
|
||||
method: Gitlab.config.ldap['method'],
|
||||
bind_dn: Gitlab.config.ldap['bind_dn'],
|
||||
password: Gitlab.config.ldap['password'],
|
||||
filter: Gitlab.config.ldap['user_filter'],
|
||||
name_proc: email_stripping_proc
|
||||
end
|
||||
|
||||
@@ -245,4 +244,4 @@ Devise.setup do |config|
|
||||
|
||||
config.omniauth provider['name'].to_sym, *provider_arguments
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user