1 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 340f41163d..d434310eff 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -47,6 +47,10 @@ require 'action_controller/helpers'
 require 'action_controller/cookies'
 require 'action_controller/cgi_process'
 require 'action_controller/caching'
+require 'action_controller/components'
+
+require 'action_view'
+ActionController::Base.template_class = ActionView::Base
 
 ActionController::Base.class_eval do
   include ActionController::Filters
@@ -60,7 +64,5 @@ ActionController::Base.class_eval do
   include ActionController::Cookies
   include ActionController::Session
   include ActionController::Caching
+  include ActionController::Components
 end
-
-require 'action_view'
-ActionController::Base.template_class = ActionView::Base
-\ No newline at end of file