aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2019-06-05 02:05:14 +0530
committerGitHub <noreply@github.com>2019-06-05 02:05:14 +0530
commit502bfdeff524d1f69bc0b5b3265e146afc1f6255 (patch)
tree789a3664825e0411b17f487c72a0049da5ee6522 /guides
parent6a1e00ce3a372e318338c4c5047d9a2fb5f75ed1 (diff)
parent913b2da2d833cfefcd6e4a111ab93446f94baab0 (diff)
downloadrails-502bfdeff524d1f69bc0b5b3265e146afc1f6255.tar.gz
rails-502bfdeff524d1f69bc0b5b3265e146afc1f6255.tar.bz2
rails-502bfdeff524d1f69bc0b5b3265e146afc1f6255.zip
Merge pull request #36376 from sharang-d/reword-content_type-change
Reword the ActionDispatch::Response#content_type change [ci skip]
Diffstat (limited to 'guides')
-rw-r--r--guides/source/upgrading_ruby_on_rails.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 1110592d5e..54f014293d 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -134,12 +134,12 @@ Action Cable JavaScript API:
+ ActionCable.logger.enabled = false
```
-### `ActionDispatch::Response#content_type` now returned Content-Type header as it is.
+### `ActionDispatch::Response#content_type` now returns the Content-Type header without modification
-Previously, `ActionDispatch::Response#content_type` returned value does NOT contain charset part.
-This behavior changed to returned Content-Type header containing charset part as it is.
+Previously, the return value of `ActionDispatch::Response#content_type` did NOT contain the charset part.
+This behavior has changed to include the previously omitted charset part as well.
-If you want just MIME type, please use `ActionDispatch::Response#media_type` instead.
+If you want just the MIME type, please use `ActionDispatch::Response#media_type` instead.
Before: