From ca3b503478e4b60436062e1b4766b009ce4fa579 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 21 Feb 2011 11:02:18 +0000 Subject: Updgraded Rails to 2.3.11 (#6887). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4904 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/initializers/10-patches.rb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'config/initializers') diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb index 25b20523b..0e23a3d43 100644 --- a/config/initializers/10-patches.rb +++ b/config/initializers/10-patches.rb @@ -79,16 +79,12 @@ end ActionMailer::Base.send :include, AsynchronousMailer -# TODO: Hack to support i18n 4.x on Rails 2.3.5. Remove post 2.3.6. -# See http://www.redmine.org/issues/6428 and http://www.redmine.org/issues/5608 -module I18n - module Backend - module Base - def warn_syntax_deprecation!(*args) - return if @skip_syntax_deprecation - warn "The {{key}} interpolation syntax in I18n messages is deprecated and will be removed in Redmine 1.2. Please use %{key} instead, see http://www.redmine.org/issues/7013 for more information." - @skip_syntax_deprecation = true - end +# TMail::Unquoter.convert_to_with_fallback_on_iso_8859_1 introduced in TMail 1.2.7 +# triggers a test failure in test_add_issue_with_japanese_keywords(MailHandlerTest) +module TMail + class Unquoter + class << self + alias_method :convert_to, :convert_to_without_fallback_on_iso_8859_1 end end end -- cgit v1.2.3