diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-23 12:49:09 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-23 12:49:09 +0400 |
| commit | 972e40cc47b267503059ab1ebb55264596de9271 (patch) | |
| tree | cee3f9c6c5c42083a8bc4468af25e341627b088f /config | |
| parent | aaffbe1c2e381a32175ae35238c309224984129e (diff) | |
| parent | e9d4587ff11c8510f01dfa184414f73d75b4550b (diff) | |
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).
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/devise.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 50669ece7a8..d5cb110e881 100644 --- a/config/initializers/devise.rb +++ b/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 |