diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-27 15:32:41 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-27 15:32:41 +0000 |
| commit | c862bc6fcf096e85daa9f3d6eec28a7ce1da171d (patch) | |
| tree | 7d593e8776addcd6452d0280e01d44ace95aa547 | |
| parent | cb4b504b26a269ba6ebb3fee165296a80d962c69 (diff) | |
| parent | 7dfb678df98b1b9ad420d9cbf4fe74f1553f34a7 (diff) | |
| download | gitlab-ce-c862bc6fcf096e85daa9f3d6eec28a7ce1da171d.tar.gz | |
Merge branch 'ldap_user_filter_fix' into 'master'
LDAP user filter fix
| -rw-r--r-- | config/initializers/devise.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index d5cb110e881..50669ece7a8 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -223,7 +223,6 @@ 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 @@ -245,4 +244,4 @@ Devise.setup do |config| config.omniauth provider['name'].to_sym, *provider_arguments end -end
\ No newline at end of file +end |