Merge branch 'ldap_user_filter_fix' into 'master'

LDAP user filter fix

Merge branch 'ldap_user_filter_fix' into 'master'
LDAP user filter fix
c862bc6f · Dmitriy Zaporozhets · cb4b504b · 7dfb678d · c862bc6f
Commit c862bc6f authored May 27, 2014 by Dmitriy Zaporozhets
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