Merge branch 'ldap_user_filter_fix' into 'master'

LDAP user filter fix

Merge branch 'ldap_user_filter_fix' into 'master'
LDAP user filter fix
Dmitriy Zaporozhets
2 parents cb4b504b 7dfb678d
Showing 1 changed file with 1 additions and 2 deletions Show diff stats
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
  
@@ -245,4 +244,4 @@ Devise.setup do |config|
  
     config.omniauth provider['name'].to_sym, *provider_arguments
   end
-end
 \ No newline at end of file
+end
...	...	@@ -223,7 +223,6 @@ Devise.setup do \|config\|
223	223	method: Gitlab.config.ldap['method'],
224	224	bind_dn: Gitlab.config.ldap['bind_dn'],
225	225	password: Gitlab.config.ldap['password'],
226		- filter: Gitlab.config.ldap['user_filter'],
227	226	name_proc: email_stripping_proc
228	227	end
229	228
...	...	@@ -245,4 +244,4 @@ Devise.setup do \|config\|
245	244
246	245	config.omniauth provider['name'].to_sym, *provider_arguments
247	246	end
248		-end
249	247	\ No newline at end of file
	248	+end
...	...