aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-20 17:15:31 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-20 17:15:31 -0800
commit83f4d86a9330533ec9af21ba18b4ab28011b8981 (patch)
treea5145f9230797f88eb34c3e28c55ba93a706e1f1 /actionpack/lib/action_controller/base.rb
parentbdccffc40eee1e11b7e5f3516bffa4c46bf97b30 (diff)
downloadrails-83f4d86a9330533ec9af21ba18b4ab28011b8981.tar.gz
rails-83f4d86a9330533ec9af21ba18b4ab28011b8981.tar.bz2
rails-83f4d86a9330533ec9af21ba18b4ab28011b8981.zip
Rename the RenderingController module to just plain Rendering
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rw-r--r--actionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index e49be371a6..ee10584548 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -9,7 +9,7 @@ module ActionController
include ActionController::HideActions
include ActionController::UrlFor
include ActionController::Redirector
- include ActionController::RenderingController
+ include ActionController::Rendering
include ActionController::RenderOptions::All
include ActionController::Layouts
include ActionController::ConditionalGet