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

Fix LDAP user filter
gitlabhq · May 30, 2014 · d5ae2bf · d5ae2bf
2 parents 13202d8 + 6d896ed
commit d5ae2bf
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -223,7 +223,6 @@
       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 @@
 
     config.omniauth provider['name'].to_sym, *provider_arguments
   end
-end
+end