diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-10-31 14:48:26 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-10-31 14:48:26 +0000 |
| commit | 7019f3416a5dd61064f7536922bc187c078c9997 (patch) | |
| tree | 7992ce02db4b7662976bcb96b6acf48cb27e93a2 | |
| parent | a98cad3a8375c2031c1c548df0a1d6e1838ba925 (diff) | |
| download | redmine-7019f3416a5dd61064f7536922bc187c078c9997.tar.gz redmine-7019f3416a5dd61064f7536922bc187c078c9997.zip | |
upgrade net-ldap gem to 0.12.0 (#17618)
git-svn-id: http://svn.redmine.org/redmine/trunk@14784 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | app/models/auth_source_ldap.rb | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -21,7 +21,7 @@ gem "rbpdf", "~> 1.18.6" # Optional gem for LDAP authentication group :ldap do - gem "net-ldap", "~> 0.10.1" + gem "net-ldap", "~> 0.12.0" end # Optional gem for OpenID authentication diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index 02ef3b42a..6fb43d44a 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -105,7 +105,7 @@ class AuthSourceLdap < AuthSource if filter.present? Net::LDAP::Filter.construct(filter) end - rescue Net::LDAP::LdapError + rescue Net::LDAP::LdapError, Net::LDAP::FilterSyntaxInvalidError nil end |