diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2015-04-21 16:35:18 -0400 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-06-11 16:54:13 -0300 |
| commit | 38818c93a9959118a87bbdeda16e0766adc67598 (patch) | |
| tree | d0bd54bfe1d5e4aa2e01389a6f3e942e5442a6fc /actionpack/lib | |
| parent | 4204778f8d26582c77fe6c1ff41d39fc523e50c0 (diff) | |
| download | rails-38818c93a9959118a87bbdeda16e0766adc67598.tar.gz rails-38818c93a9959118a87bbdeda16e0766adc67598.tar.bz2 rails-38818c93a9959118a87bbdeda16e0766adc67598.zip | |
Remove api_rendering is not needed
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/api.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/api/api_rendering.rb | 14 |
3 files changed, 1 insertions, 19 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 952a035a16..f4c9cfd190 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -42,10 +42,6 @@ module ActionController autoload :UrlFor end - autoload_under "api" do - autoload :ApiRendering - end - autoload :TestCase, 'action_controller/test_case' autoload :TemplateAssertions, 'action_controller/test_case' 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 |