Download as
Browse Code »

Commit 972e40cc47b267503059ab1ebb55264596de9271

Authored by Dmitriy Zaporozhets
2 parents aaffbe1c e9d4587f
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

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).
Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
config/initializers/devise.rb
  Diff comments   View file @972e40c
@@ -223,6 +223,7 @@ Devise.setup do |config| @@ -223,6 +223,7 @@ Devise.setup do |config|
223 method: Gitlab.config.ldap['method'], 223 method: Gitlab.config.ldap['method'],
224 bind_dn: Gitlab.config.ldap['bind_dn'], 224 bind_dn: Gitlab.config.ldap['bind_dn'],
225 password: Gitlab.config.ldap['password'], 225 password: Gitlab.config.ldap['password'],
  226 + filter: Gitlab.config.ldap['user_filter'],
226 name_proc: email_stripping_proc 227 name_proc: email_stripping_proc
227 end 228 end
228 229
@@ -244,4 +245,4 @@ Devise.setup do |config| @@ -244,4 +245,4 @@ Devise.setup do |config|
244 245
245 config.omniauth provider['name'].to_sym, *provider_arguments 246 config.omniauth provider['name'].to_sym, *provider_arguments
246 end 247 end
247 -end 248 -end
  249 +end
248 \ No newline at end of file 250 \ No newline at end of file