From 7019f3416a5dd61064f7536922bc187c078c9997 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 31 Oct 2015 14:48:26 +0000 Subject: upgrade net-ldap gem to 0.12.0 (#17618) git-svn-id: http://svn.redmine.org/redmine/trunk@14784 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 2 +- app/models/auth_source_ldap.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index aa3f2019a..259ab6aca 100644 --- a/Gemfile +++ b/Gemfile @@ -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 -- cgit v1.2.3