Merge branch 'bug-to-ldap-configuration' into 'master'

LDAP Configuration Fix This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/180 in new installations of version 6.8 (installations upgraded from 6.7 still have the issue, however).

Merge branch 'bug-to-ldap-configuration' into 'master'
LDAP Configuration Fix This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/180 in new installations of version 6.8 (installations upgraded from 6.7 still have the issue, however).
Dmitriy Zaporozhets
2 parents aaffbe1c e9d4587f
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
config/initializers/devise.rb
@@ -223,6 +223,7 @@ 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
  
@@ -244,4 +245,4 @@ Devise.setup do |config|
  
     config.omniauth provider['name'].to_sym, *provider_arguments
   end
 -end
+end
 \ No newline at end of file
...	...	@@ -223,6 +223,7 @@ 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'],
226	227	name_proc: email_stripping_proc
227	228	end
228	229
...	...	@@ -244,4 +245,4 @@ Devise.setup do \|config\|
244	245
245	246	config.omniauth provider['name'].to_sym, *provider_arguments
246	247	end
247	248	-end
	249	+end
248	250	\ No newline at end of file
...	...