diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2016-01-21 00:17:15 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2016-01-21 00:17:15 -0300 |
| commit | e5b9b7d25d3ff3a641adea43dd2bd88625d1da20 (patch) | |
| tree | 3821f34571b1fb0f63f3ef14921a44b370a0839f /actionpack/lib/action_controller | |
| parent | c555c03bc104670cfdbbd0e6828e325ec46545fa (diff) | |
| parent | 77acc004efad07dfd4d4f83be14ef897968a3fd9 (diff) | |
| download | rails-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')
| -rw-r--r-- | actionpack/lib/action_controller/api.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/api/api_rendering.rb | 14 |
2 files changed, 15 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, diff --git a/actionpack/lib/action_controller/api/api_rendering.rb b/actionpack/lib/action_controller/api/api_rendering.rb new file mode 100644 index 0000000000..3a08d28c39 --- /dev/null +++ b/actionpack/lib/action_controller/api/api_rendering.rb @@ -0,0 +1,14 @@ +module ActionController + module ApiRendering + extend ActiveSupport::Concern + + included do + include Rendering + end + + def render_to_body(options = {}) + _process_options(options) + super + end + end +end |