aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-08-06 23:48:48 +0200
committerJosé Valim <jose.valim@gmail.com>2009-08-07 17:17:51 +0200
commitaed135d3e261cbee153a35fcfbeb47e2e02b12e4 (patch)
treeab3b3ff0b8cbd632f34d938bf1117b075f4813a7 /actionpack/lib/action_controller/base.rb
parent1fd65c80fcdc6080b9efa27f41dbb7f7d95a17c6 (diff)
downloadrails-aed135d3e261cbee153a35fcfbeb47e2e02b12e4.tar.gz
rails-aed135d3e261cbee153a35fcfbeb47e2e02b12e4.tar.bz2
rails-aed135d3e261cbee153a35fcfbeb47e2e02b12e4.zip
Renamed presenter to renderer, added some documentation and defined its API.
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rw-r--r--actionpack/lib/action_controller/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 9d9f735e27..40f4802b74 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -10,8 +10,8 @@ module ActionController
include ActionController::HideActions
include ActionController::UrlFor
include ActionController::Redirector
- include ActionController::Renderer
- include ActionController::Renderers::All
+ include ActionController::RenderingController
+ include ActionController::RenderOptions::All
include ActionController::Layouts
include ActionController::ConditionalGet
include ActionController::RackConvenience