Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTravis Odom <travis.a.odom@gmail.com>2014-04-21 19:48:42 +0400
committerTravis Odom <travis.a.odom@gmail.com>2014-04-21 19:48:42 +0400
commite9d4587ff11c8510f01dfa184414f73d75b4550b (patch)
tree04810cf1f1dbfb083361d8a2fa2272b10ed24acf /config
parent2bfd95d8502607ee8c41675b1711a6710b1e05e1 (diff)
Actually use the 'user_filter' configuration option
Diffstat (limited to 'config')
-rw-r--r--config/initializers/devise.rb3
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