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

Fix LDAP user filter

Merge branch 'fix_ldap_user_filter' into '6-9-stable'
Fix LDAP user filter
d5ae2bfc · Marin Jankovski · 13202d82 · 6d896ed5 · d5ae2bfc
Commit d5ae2bfc authored May 30, 2014 by Marin Jankovski
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

config/initializers/devise.rb config/initializers/devise.rb +1 -2

No files found.
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -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