aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/new_base/base.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-21 14:34:42 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-21 14:36:00 -0700
commit2daac47d585c5b8f37e4749d6a9a3aea4b989bd0 (patch)
treec6c7f7f66ca69f0f8012d7672645bfbcd86c6b3d /actionpack/lib/action_controller/new_base/base.rb
parente693f45e155a81b6c337b8766870b56716a05105 (diff)
downloadrails-2daac47d585c5b8f37e4749d6a9a3aea4b989bd0.tar.gz
rails-2daac47d585c5b8f37e4749d6a9a3aea4b989bd0.tar.bz2
rails-2daac47d585c5b8f37e4749d6a9a3aea4b989bd0.zip
Added the ability to register methods to handle specific render option keys and render :json
Diffstat (limited to 'actionpack/lib/action_controller/new_base/base.rb')
-rw-r--r--actionpack/lib/action_controller/new_base/base.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index b8674d5099..6e1f92c45d 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -11,6 +11,8 @@ module ActionController
include ActionController::UrlFor
include ActionController::Redirector
include ActionController::Renderer
+ include ActionController::RenderOptions
+ include ActionController::Renderers::Json
include ActionController::Layouts
include ActionController::ConditionalGet