diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-03-11 10:29:10 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-03-11 10:29:10 -0700 |
| commit | 3bfda09fa069caf9b28df78a19bb63c23c60169b (patch) | |
| tree | dc5d1b31bf7b71a71a439cf3e0acbc33f032ca91 /actionpack/lib/action_controller/metal | |
| parent | e56b594d323e9c17398e65caa0fad20500868135 (diff) | |
| parent | 48f140cf7459c963a54637c897448b959dbbfd26 (diff) | |
| download | rails-3bfda09fa069caf9b28df78a19bb63c23c60169b.tar.gz rails-3bfda09fa069caf9b28df78a19bb63c23c60169b.tar.bz2 rails-3bfda09fa069caf9b28df78a19bb63c23c60169b.zip | |
Merge pull request #22854 from jcoyne/missing_template
Default rendering behavior if respond_to collector doesn't have a block.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index 173a14a1d2..2e89af1a5e 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -198,7 +198,7 @@ module ActionController #:nodoc: _process_format(format) _set_rendered_content_type format response = collector.response - response ? response.call : render({}) + response.call if response else raise ActionController::UnknownFormat end |