diff options
Diffstat (limited to 'actionpack/lib/action_controller')
4 files changed, 13 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 1d4a719aa6..a1cfa32d4d 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -76,6 +76,7 @@ module ActionController def consider_all_requests_local=(value) ActiveSupport::Deprecation.warn "ActionController::Base.consider_all_requests_local= is no longer effective. " << "Please configure it on your application with config.consider_all_requests_local=" + Rails.application.config.consider_all_requests_local = value end def allow_concurrency @@ -87,6 +88,7 @@ module ActionController def allow_concurrency=(value) ActiveSupport::Deprecation.warn "ActionController::Base.allow_concurrency= is no longer effective. " << "Please configure it on your application with config.allow_concurrency=" + Rails.application.config.allow_concurrency = value end def rescue_action(env) diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index 51702368c1..4f3ad07be5 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/class/attribute' +require 'active_support/core_ext/module/attribute_accessors' module ActionController # In <b>routes.rb</b> one defines URL-to-controller mappings, but the reverse @@ -87,7 +88,14 @@ module ActionController included do ActionController::Routing::Routes.install_helpers(self) - class_attribute :default_url_options + + # Including in a class uses an inheritable hash. Modules get a plain hash. + if respond_to?(:class_attribute) + class_attribute :default_url_options + else + mattr_accessor :default_url_options + end + self.default_url_options = {} end diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index 9151de4462..55a5c22ac0 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -1,5 +1,6 @@ require "action_controller" require "rails" +require "action_view/railtie" module ActionController class Railtie < Rails::Railtie diff --git a/actionpack/lib/action_controller/railties/subscriber.rb b/actionpack/lib/action_controller/railties/subscriber.rb index 1f0e6bf51a..4499e82292 100644 --- a/actionpack/lib/action_controller/railties/subscriber.rb +++ b/actionpack/lib/action_controller/railties/subscriber.rb @@ -15,9 +15,8 @@ module ActionController payload = event.payload additions = ActionController::Base.log_process_action(payload) - message = "Completed in %.0fms" % event.duration + message = "Completed #{payload[:status]} #{Rack::Utils::HTTP_STATUS_CODES[payload[:status]]} in %.0fms" % event.duration message << " (#{additions.join(" | ")})" unless additions.blank? - message << " with #{payload[:status]}" info(message) end |