diff options
| author | Jon Moss <me@jonathanmoss.me> | 2016-01-20 19:16:23 -0500 |
|---|---|---|
| committer | Jon Moss <me@jonathanmoss.me> | 2016-01-20 19:16:23 -0500 |
| commit | 77acc004efad07dfd4d4f83be14ef897968a3fd9 (patch) | |
| tree | 9742420e0f68a49460a81c7ae6761998c1b14b8e /actionpack/lib/action_controller/api.rb | |
| parent | 06397336b2c9b1de9462f1baa8075573fd3709dd (diff) | |
| download | rails-77acc004efad07dfd4d4f83be14ef897968a3fd9.tar.gz rails-77acc004efad07dfd4d4f83be14ef897968a3fd9.tar.bz2 rails-77acc004efad07dfd4d4f83be14ef897968a3fd9.zip | |
Re-add ActionController::ApiRendering
- Fixes bug #23142.
- Bug was occurring only with ActionController::API, because `_process_options` wasn't being run for API requests, even though it was being run for normal app requests.
Diffstat (limited to 'actionpack/lib/action_controller/api.rb')
| -rw-r--r-- | actionpack/lib/action_controller/api.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/api.rb b/actionpack/lib/action_controller/api.rb index 1a46d49a49..ff12705abe 100644 --- a/actionpack/lib/action_controller/api.rb +++ b/actionpack/lib/action_controller/api.rb @@ -112,7 +112,7 @@ module ActionController UrlFor, Redirecting, - Rendering, + ApiRendering, Renderers::All, ConditionalGet, BasicImplicitRender, |