Commit e9d4587ff11c8510f01dfa184414f73d75b4550b
1 parent
2bfd95d8
Exists in
spb-stable
and in
2 other branches
Actually use the 'user_filter' configuration option
Showing
1 changed file
with
2 additions
and
1 deletions
Show diff stats
config/initializers/devise.rb
| @@ -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 |