jro_apps/redmine Commit - r4784:ca3b503478e4

Updgraded Rails to 2.3.11 (#6887)....

Jean-Philippe Lang -

r4784:ca3b503478e4

parent child

Context file:

r4784:ca3b503478e4

Collapse all files

config/environment.rb +2 -2

              # Be sure to restart your web server when you modify this file.
              # Uncomment below to force Rails into production mode when
              # you don't control web/app server and can't set it the proper way
              # ENV['RAILS_ENV'] ||= 'production'
              # 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
              require File.join(File.dirname(__FILE__), 'boot')
              # Load Engine plugin if available
              begin
                require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
              rescue LoadError
                # Not available
              end
              Rails::Initializer.run do |config|
                # Settings in config/environments/* take precedence those specified here
                # Skip frameworks you're not going to use
                # config.frameworks -= [ :action_web_service, :action_mailer ]
                # 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
                # (by default production uses :info, the others :debug)
                # config.log_level = :debug
                # Enable page/fragment caching by setting a file-based store
                # (remember to create the caching directory and make it readable to the application)
                # config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
                # Activate observers that should always be running
                # config.active_record.observers = :cacher, :garbage_collector
                config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer
                # Make Active Record use UTC-base instead of local time
                # config.active_record.default_timezone = :utc
                # Use Active Record's schema dumper instead of SQL when creating the test database
                # (enables use of different database adapters for development and test environments)
                # config.active_record.schema_format = :ruby
                # Deliveries are disabled by default. Do NOT modify this section.
                # Define your email configuration in configuration.yml instead.
                # It will automatically turn deliveries on
                config.action_mailer.perform_deliveries = false
                config.gem 'rubytree', :lib => 'tree'
                config.gem 'coderay', :version => '~>0.9.7'
                # Load any local configuration that is kept out of source control
                # (e.g. gems, patches).
                if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
                  instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
                end
              end

config/initializers/10-patches.rb +6 -10

              require 'active_record'
              module ActiveRecord
                class Base
                  include Redmine::I18n
                  # Translate attribute names for validation errors display
                  def self.human_attribute_name(attr)
                    l("field_#{attr.to_s.gsub(/_id$/, '')}")
                  end
                end
              end
              module ActiveRecord
                class Errors
                  def full_messages(options = {})
                    full_messages = []
                    @errors.each_key do |attr|
                      @errors[attr].each do |message|
                        next unless message
                        if attr == "base"
                          full_messages << message
                        elsif attr == "custom_values"
                          # Replace the generic "custom values is invalid"
                          # with the errors on custom values
                          @base.custom_values.each do |value|
                            value.errors.each do |attr, msg|
                              full_messages << value.custom_field.name + ' ' + msg
                            end
                          end
                        else
                          attr_name = @base.class.human_attribute_name(attr)
                          full_messages << attr_name + ' ' + message.to_s
                        end
                      end
                    end
                    full_messages
                  end
                end
              end
              module ActionView
                module Helpers
                  module DateHelper
                    # distance_of_time_in_words breaks when difference is greater than 30 years
                    def distance_of_date_in_words(from_date, to_date = 0, options = {})
                      from_date = from_date.to_date if from_date.respond_to?(:to_date)
                      to_date = to_date.to_date if to_date.respond_to?(:to_date)
                      distance_in_days = (to_date - from_date).abs
                      I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
                        case distance_in_days
                          when 0..60     then locale.t :x_days,             :count => distance_in_days.round
                          when 61..720   then locale.t :about_x_months,     :count => (distance_in_days / 30).round
                          else                locale.t :over_x_years,       :count => (distance_in_days / 365).floor
                        end
                      end
                    end
                  end
                end
              end
              ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
              # Adds :async_smtp and :async_sendmail delivery methods
              # to perform email deliveries asynchronously
              module AsynchronousMailer
                %w(smtp sendmail).each do |type|
                  define_method("perform_delivery_async_#{type}") do |mail|
                    Thread.start do
                      send "perform_delivery_#{type}", mail
                    end
                  end
                end
              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
              module ActionController
                module MimeResponds
                  class Responder
                    def api(&block)
                      any(:xml, :json, &block)
                    end
                  end
                end
              end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages