summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-10-31 14:48:26 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-10-31 14:48:26 +0000
commit7019f3416a5dd61064f7536922bc187c078c9997 (patch)
tree7992ce02db4b7662976bcb96b6acf48cb27e93a2 /app/models
parenta98cad3a8375c2031c1c548df0a1d6e1838ba925 (diff)
downloadredmine-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
Diffstat (limited to 'app/models')
-rw-r--r--app/models/auth_source_ldap.rb2
1 files changed, 1 insertions, 1 deletions
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