kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updgraded Rails to 2.3.11 (#6887).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4904 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-02-21 11:02:18 +00:00 committed by Eric Davis
parent 3f41152b4f
commit 0e789c5272
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/environment.rb
View File

@ -5,7 +5,7 @@
# ENV['RAILS_ENV'] ||= 'production' # ENV['RAILS_ENV'] ||= 'production'
# Specifies gem version of Rails to use when vendor/rails is not present # Specifies gem version of Rails to use when vendor/rails is not present
RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration # Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot') require File.join(File.dirname(__FILE__), 'boot')
@ -24,7 +24,7 @@ Rails::Initializer.run do |config|
# config.frameworks -= [ :action_web_service, :action_mailer ] # config.frameworks -= [ :action_web_service, :action_mailer ]
# Add additional load paths for sweepers # Add additional load paths for sweepers
config.load_paths += %W( #{RAILS_ROOT}/app/sweepers ) config.autoload_paths += %W( #{RAILS_ROOT}/app/sweepers )
# Force all environments to use the same logger level # Force all environments to use the same logger level
# (by default production uses :info, the others :debug) # (by default production uses :info, the others :debug)

16
config/initializers/10-patches.rb
View File

@ -79,16 +79,12 @@ end
ActionMailer::Base.send :include, AsynchronousMailer ActionMailer::Base.send :include, AsynchronousMailer
# TODO: Hack to support i18n 4.x on Rails 2.3.5. Remove post 2.3.6. # TMail::Unquoter.convert_to_with_fallback_on_iso_8859_1 introduced in TMail 1.2.7
# See http://www.redmine.org/issues/6428 and http://www.redmine.org/issues/5608 # triggers a test failure in test_add_issue_with_japanese_keywords(MailHandlerTest)
module I18n module TMail
module Backend class Unquoter
module Base class << self
def warn_syntax_deprecation!(*args) alias_method :convert_to, :convert_to_without_fallback_on_iso_8859_1
return if @skip_syntax_deprecation
ActiveSupport::Deprecation.warn "The {{key}} interpolation syntax in I18n messages is deprecated and will be removed in ChiliProject 2.0. Please use %{key} instead. See the notice at https://www.chiliproject.org/boards/2/topics/243 for more information."
@skip_syntax_deprecation = true
end
end end
end end
end end