diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2015-10-06 11:30:02 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2015-10-06 11:30:02 -0700 |
| commit | 71317e6406dba9a552760ec035b67b3c16162528 (patch) | |
| tree | 78cc5fc25b114c26e14d855370e16139dbd4b679 /actionpack/lib/action_dispatch/http/response.rb | |
| parent | 5b69e30622de27e8010fd8cb32a97b5f0fe194e2 (diff) | |
| parent | 565094a8b5cdfa158fef6ae75252fd98a4ba8fe4 (diff) | |
| download | rails-71317e6406dba9a552760ec035b67b3c16162528.tar.gz rails-71317e6406dba9a552760ec035b67b3c16162528.tar.bz2 rails-71317e6406dba9a552760ec035b67b3c16162528.zip | |
Merge pull request #21869 from jeremy/mime-constant-deprecation
Use `Mime[:foo]` instead of `Mime::Type[:FOO]` for back compat
Diffstat (limited to 'actionpack/lib/action_dispatch/http/response.rb')
| -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 d4a534d892..e8cff9a73a 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -427,7 +427,7 @@ module ActionDispatch # :nodoc: return if content_type ct = parse_content_type - set_content_type(ct.mime_type || Mime::Type[:HTML].to_s, + set_content_type(ct.mime_type || Mime[:html].to_s, ct.charset || self.class.default_charset) end |