diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-05-30 08:46:09 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-05-30 08:46:09 +0000 |
| commit | d5ae2bfc5dec95ab3058ac211fa3b2c64229fe08 (patch) | |
| tree | 0067efe7ab3fc3c1c541e58b6b4fc9282c85dcad | |
| parent | 13202d828bb4ecf13396961ec39e7f29d86b9ba5 (diff) | |
| parent | 6d896ed5c285ec4f84508a86b31c98b316811f5c (diff) | |
| download | gitlab-ce-d5ae2bfc5dec95ab3058ac211fa3b2c64229fe08.tar.gz | |
Merge branch 'fix_ldap_user_filter' into '6-9-stable'
Fix LDAP user filter
| -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 |