diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-17 23:09:28 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-17 23:09:28 +0100 |
| commit | 21dcbb17de86b92df1a67e233fdc457be4fdf2d7 (patch) | |
| tree | de931efeae23ce498b2930de5d213f517ca8bc5a /actionpack | |
| parent | 6416a35f4b3290a93145d40045147fc01d36e756 (diff) | |
| download | rails-21dcbb17de86b92df1a67e233fdc457be4fdf2d7.tar.gz rails-21dcbb17de86b92df1a67e233fdc457be4fdf2d7.tar.bz2 rails-21dcbb17de86b92df1a67e233fdc457be4fdf2d7.zip | |
Ensure json is loaded before using responders.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/responder.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 94c9ec7478..16664098e5 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -1,5 +1,4 @@ require "abstract_controller/base" -require "action_view/base" module AbstractController class DoubleRenderError < Error diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb index 6178a59029..0b2cee6868 100644 --- a/actionpack/lib/action_controller/metal/responder.rb +++ b/actionpack/lib/action_controller/metal/responder.rb @@ -1,3 +1,5 @@ +require 'active_support/json' + module ActionController #:nodoc: # Responder is responsible for exposing a resource to different mime requests, # usually depending on the HTTP verb. The responder is triggered when |