diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-07-18 12:42:08 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-07-18 12:42:08 +0930 |
| commit | e78746fefdd1c5528a10ca23a5f40804ef855086 (patch) | |
| tree | deae317ebeca2cb20b57e9ad9a8c0c36720c8d7f /actionview/lib | |
| parent | 0db98b3ec8226042a5c3400d594d803abb5b169f (diff) | |
| parent | 8cb8ce98d903929342e2ca3a54a07ab5196baf93 (diff) | |
| download | rails-e78746fefdd1c5528a10ca23a5f40804ef855086.tar.gz rails-e78746fefdd1c5528a10ca23a5f40804ef855086.tar.bz2 rails-e78746fefdd1c5528a10ca23a5f40804ef855086.zip | |
Merge pull request #20923 from sikachu/silence-render-text-warning
Stop using deprecated `render :text` in test
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/rendering_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/rendering_helper.rb b/actionview/lib/action_view/helpers/rendering_helper.rb index 827932d8e2..c98f2d74a8 100644 --- a/actionview/lib/action_view/helpers/rendering_helper.rb +++ b/actionview/lib/action_view/helpers/rendering_helper.rb @@ -18,7 +18,7 @@ module ActionView # performs HTML escape on the string first. Setting the content type as # <tt>text/html</tt>. # * <tt>:body</tt> - Renders the text passed in, and inherits the content - # type of <tt>text/html</tt> from <tt>ActionDispatch::Response</tt> + # type of <tt>text/plain</tt> from <tt>ActionDispatch::Response</tt> # object. # # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter |