aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/api.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/api.rb')
-rw-r--r--actionpack/lib/action_controller/api.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/api.rb b/actionpack/lib/action_controller/api.rb
index 3af63b8892..ff12705abe 100644
--- a/actionpack/lib/action_controller/api.rb
+++ b/actionpack/lib/action_controller/api.rb
@@ -90,7 +90,7 @@ module ActionController
# Shortcut helper that returns all the ActionController::API modules except
# the ones passed as arguments:
#
- # class MetalController
+ # class MyAPIBaseController < ActionController::Metal
# ActionController::API.without_modules(:ForceSSL, :UrlFor).each do |left|
# include left
# end
@@ -112,10 +112,9 @@ module ActionController
UrlFor,
Redirecting,
- Rendering,
+ ApiRendering,
Renderers::All,
ConditionalGet,
- RackDelegation,
BasicImplicitRender,
StrongParameters,