##// END OF EJS Templates
Updgraded Rails to 2.3.11 (#6887)....
Jean-Philippe Lang -
r4784:ca3b503478e4
parent child
Show More
@@ -5,7 +5,7
5 # ENV['RAILS_ENV'] ||= 'production'
5 # ENV['RAILS_ENV'] ||= 'production'
6
6
7 # Specifies gem version of Rails to use when vendor/rails is not present
7 # Specifies gem version of Rails to use when vendor/rails is not present
8 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
8 RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
9
9
10 # Bootstrap the Rails environment, frameworks, and default configuration
10 # Bootstrap the Rails environment, frameworks, and default configuration
11 require File.join(File.dirname(__FILE__), 'boot')
11 require File.join(File.dirname(__FILE__), 'boot')
@@ -24,7 +24,7 Rails::Initializer.run do |config|
24 # config.frameworks -= [ :action_web_service, :action_mailer ]
24 # config.frameworks -= [ :action_web_service, :action_mailer ]
25
25
26 # Add additional load paths for sweepers
26 # Add additional load paths for sweepers
27 config.load_paths += %W( #{RAILS_ROOT}/app/sweepers )
27 config.autoload_paths += %W( #{RAILS_ROOT}/app/sweepers )
28
28
29 # Force all environments to use the same logger level
29 # Force all environments to use the same logger level
30 # (by default production uses :info, the others :debug)
30 # (by default production uses :info, the others :debug)
@@ -79,16 +79,12 end
79
79
80 ActionMailer::Base.send :include, AsynchronousMailer
80 ActionMailer::Base.send :include, AsynchronousMailer
81
81
82 # TODO: Hack to support i18n 4.x on Rails 2.3.5. Remove post 2.3.6.
82 # TMail::Unquoter.convert_to_with_fallback_on_iso_8859_1 introduced in TMail 1.2.7
83 # See http://www.redmine.org/issues/6428 and http://www.redmine.org/issues/5608
83 # triggers a test failure in test_add_issue_with_japanese_keywords(MailHandlerTest)
84 module I18n
84 module TMail
85 module Backend
85 class Unquoter
86 module Base
86 class << self
87 def warn_syntax_deprecation!(*args)
87 alias_method :convert_to, :convert_to_without_fallback_on_iso_8859_1
88 return if @skip_syntax_deprecation
89 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."
90 @skip_syntax_deprecation = true
91 end
92 end
88 end
93 end
89 end
94 end
90 end
General Comments 0
You need to be logged in to leave comments. Login now