diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-28 17:52:44 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-28 17:52:44 -0300 |
| commit | d12daa4b3370447e55710cadf7579d1b96cdfcad (patch) | |
| tree | cb3217fc334341f094f207662a9d93d38be27270 /actionpack/test/controller | |
| parent | cbe7899f9d5fece4749f75828fd120d67056f356 (diff) | |
| parent | 2de60a926b541d837d7a927bb2efc8135679ac40 (diff) | |
| download | rails-d12daa4b3370447e55710cadf7579d1b96cdfcad.tar.gz rails-d12daa4b3370447e55710cadf7579d1b96cdfcad.tar.bz2 rails-d12daa4b3370447e55710cadf7579d1b96cdfcad.zip | |
Merge pull request #21420 from akihiro17/rendering
Set the content-type to `text/html` if the options[:html] is true
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/new_base/render_html_test.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/test/controller/new_base/render_html_test.rb b/actionpack/test/controller/new_base/render_html_test.rb index 49c1b67d04..e9ea57e329 100644 --- a/actionpack/test/controller/new_base/render_html_test.rb +++ b/actionpack/test/controller/new_base/render_html_test.rb @@ -4,7 +4,6 @@ module RenderHtml class MinimalController < ActionController::Metal include AbstractController::Rendering include ActionController::Rendering - include ActionView::Rendering def index render html: "Hello World!" |