Commit c862bc6fcf096e85daa9f3d6eec28a7ce1da171d
Exists in
spb-stable
and in
2 other branches
Merge branch 'ldap_user_filter_fix' into 'master'
LDAP user filter fix
Showing
1 changed file
with
1 additions
and
2 deletions
Show diff stats
config/initializers/devise.rb
| @@ -223,7 +223,6 @@ Devise.setup do |config| | @@ -223,7 +223,6 @@ 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'], | ||
| 227 | name_proc: email_stripping_proc | 226 | name_proc: email_stripping_proc |
| 228 | end | 227 | end |
| 229 | 228 | ||
| @@ -245,4 +244,4 @@ Devise.setup do |config| | @@ -245,4 +244,4 @@ Devise.setup do |config| | ||
| 245 | 244 | ||
| 246 | config.omniauth provider['name'].to_sym, *provider_arguments | 245 | config.omniauth provider['name'].to_sym, *provider_arguments |
| 247 | end | 246 | end |
| 248 | -end | ||
| 249 | \ No newline at end of file | 247 | \ No newline at end of file |
| 248 | +end |