diff options
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/api.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/api/api_rendering.rb | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/actionpack/lib/action_controller/api.rb b/actionpack/lib/action_controller/api.rb index f9cbbf227f..2b31ed2cbe 100644 --- a/actionpack/lib/action_controller/api.rb +++ b/actionpack/lib/action_controller/api.rb @@ -127,7 +127,7 @@ module ActionController UrlFor, Redirecting, - ApiRendering, + Rendering, Renderers::All, ConditionalGet, RackDelegation, diff --git a/actionpack/lib/action_controller/api/api_rendering.rb b/actionpack/lib/action_controller/api/api_rendering.rb deleted file mode 100644 index 3a08d28c39..0000000000 --- a/actionpack/lib/action_controller/api/api_rendering.rb +++ /dev/null @@ -1,14 +0,0 @@ -module ActionController - module ApiRendering - extend ActiveSupport::Concern - - included do - include Rendering - end - - def render_to_body(options = {}) - _process_options(options) - super - end - end -end |