From 38818c93a9959118a87bbdeda16e0766adc67598 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 21 Apr 2015 16:35:18 -0400
Subject: [PATCH] Remove api_rendering is not needed

---
 actionpack/lib/action_controller.rb                |  4 ----
 actionpack/lib/action_controller/api.rb            |  2 +-
 .../lib/action_controller/api/api_rendering.rb     | 14 --------------
 3 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 actionpack/lib/action_controller/api/api_rendering.rb

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