Commit 972e40cc authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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).
parents aaffbe1c e9d4587f
...@@ -223,6 +223,7 @@ Devise.setup do |config| ...@@ -223,6 +223,7 @@ Devise.setup do |config|
method: Gitlab.config.ldap['method'], method: Gitlab.config.ldap['method'],
bind_dn: Gitlab.config.ldap['bind_dn'], bind_dn: Gitlab.config.ldap['bind_dn'],
password: Gitlab.config.ldap['password'], password: Gitlab.config.ldap['password'],
filter: Gitlab.config.ldap['user_filter'],
name_proc: email_stripping_proc name_proc: email_stripping_proc
end end
...@@ -244,4 +245,4 @@ Devise.setup do |config| ...@@ -244,4 +245,4 @@ Devise.setup do |config|
config.omniauth provider['name'].to_sym, *provider_arguments config.omniauth provider['name'].to_sym, *provider_arguments
end end
end end
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment