aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-09-14 16:08:36 -0300
committerGitHub <noreply@github.com>2016-09-14 16:08:36 -0300
commit26a1034a8988d38a8a6a7e905a9e1d66a8592267 (patch)
treee9652def56e8c7abc3d8521c1aa95114c8cedc1e /actionpack
parent0ad38412f4278223dbdf46c8c1fd6233e4d54db2 (diff)
parent875dde1eba682fe657bddf385193908a4712737b (diff)
downloadrails-26a1034a8988d38a8a6a7e905a9e1d66a8592267.tar.gz
rails-26a1034a8988d38a8a6a7e905a9e1d66a8592267.tar.bz2
rails-26a1034a8988d38a8a6a7e905a9e1d66a8592267.zip
Merge pull request #26498 from FriedSock/correct-render-text-deprecation-message
Correct `render text:` deprecation message
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 46ddf48926..f8f91ed41c 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -90,7 +90,7 @@ module ActionController
render as `text/plain`, `render html: '<strong>HTML</strong>'` to
render as `text/html`, or `render body: 'raw'` to match the deprecated
behavior and render with the default Content-Type, which is
- `text/plain`.
+ `text/html`.
WARNING
end