diff options
| author | प्रथमेश Sonpatki <csonpatki@gmail.com> | 2017-07-13 13:07:02 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-13 13:07:02 +0530 |
| commit | a34ee0c41f8081b6c4869fd0546f75713c09805c (patch) | |
| tree | 47802d1091ccc89069979bf015906208286392f2 /actionpack/lib | |
| parent | 58f10a31b37e9bb6e975a71aa63744f318ee043d (diff) | |
| parent | 5e989027e0bfe55798a8390111e249a26dd2c0a7 (diff) | |
| download | rails-a34ee0c41f8081b6c4869fd0546f75713c09805c.tar.gz rails-a34ee0c41f8081b6c4869fd0546f75713c09805c.tar.bz2 rails-a34ee0c41f8081b6c4869fd0546f75713c09805c.zip | |
Merge pull request #29778 from yui-knk/fix_charset_doc
[ci skip] `Response#charset=` uses `default_charset` when `nil` is passed
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index eab663e2e0..29d8ba3d04 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -252,7 +252,7 @@ module ActionDispatch # :nodoc: end # Sets the HTTP character set. In case of +nil+ parameter - # it sets the charset to utf-8. + # it sets the charset to +default_charset+. # # response.charset = 'utf-16' # => 'utf-16' # response.charset = nil # => 'utf-8' |