Merge branch 'master' into wip_abstract_controller

Conflicts:
	actionpack/lib/action_controller/abstract/callbacks.rb
	actionpack/lib/action_controller/abstract/renderer.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_controller/dispatch/dispatcher.rb
	actionpack/lib/action_controller/routing/route_set.rb
	actionpack/lib/action_controller/testing/process.rb
	actionpack/test/abstract_controller/layouts_test.rb
	actionpack/test/controller/filters_test.rb
	actionpack/test/controller/helper_test.rb
	actionpack/test/controller/render_test.rb
	actionpack/test/new_base/test_helper.rb

1 files changed, 7 insertions, 4 deletions

diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb
index f3210a040a..6e15b3e81b 100644
--- a/actionpack/lib/action_controller/abstract/callbacks.rb
+++ b/actionpack/lib/action_controller/abstract/callbacks.rb
@@ -1,10 +1,13 @@
 module AbstractController
   module Callbacks
-    setup do
-      include ActiveSupport::NewCallbacks
-      define_callbacks :process_action, "response_body"
+    extend ActiveSupport::DependencyModule
+
+    depends_on ActiveSupport::NewCallbacks
+
+    included do
+      define_callbacks :process_action
     end
-    
+
     def process_action
       _run_process_action_callbacks(action_name) do
         super