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'
972e40cc · Dmitriy Zaporozhets · aaffbe1c · e9d4587f · 972e40cc
Commit 972e40cc authored Apr 23, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

devise.rb config/initializers/devise.rb +3 -1

No files found.
--- 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