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

Fix LDAP user filter
This commit is contained in:
Marin Jankovski
2014-05-30 08:46:09 +00:00
+1 -2
View File
@@ -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