aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2016-01-21 00:17:15 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2016-01-21 00:17:15 -0300
commite5b9b7d25d3ff3a641adea43dd2bd88625d1da20 (patch)
tree3821f34571b1fb0f63f3ef14921a44b370a0839f /actionpack/lib/action_controller.rb
parentc555c03bc104670cfdbbd0e6828e325ec46545fa (diff)
parent77acc004efad07dfd4d4f83be14ef897968a3fd9 (diff)
downloadrails-e5b9b7d25d3ff3a641adea43dd2bd88625d1da20.tar.gz
rails-e5b9b7d25d3ff3a641adea43dd2bd88625d1da20.tar.bz2
rails-e5b9b7d25d3ff3a641adea43dd2bd88625d1da20.zip
Merge pull request #23149 from maclover7/fix-23142
Re-add ActionController::ApiRendering
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 3d3af555c9..40f33a9de0 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -41,6 +41,10 @@ module ActionController
autoload :UrlFor
end
+ autoload_under "api" do
+ autoload :ApiRendering
+ end
+
autoload :TestCase, 'action_controller/test_case'
autoload :TemplateAssertions, 'action_controller/test_case'