aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http/response.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-09-08 16:08:13 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-09-08 16:14:47 -0700
commita27bb77482988af58f0abd7b296fb9f5adf0d693 (patch)
treedfcfc9d397c19a2f9d2566bc49a3386859767d79 /actionpack/lib/action_dispatch/http/response.rb
parentc10efc838698a4d3c99feba9ea85d1f42062e36a (diff)
downloadrails-a27bb77482988af58f0abd7b296fb9f5adf0d693.tar.gz
rails-a27bb77482988af58f0abd7b296fb9f5adf0d693.tar.bz2
rails-a27bb77482988af58f0abd7b296fb9f5adf0d693.zip
mime_type will always return a string
Diffstat (limited to 'actionpack/lib/action_dispatch/http/response.rb')
-rw-r--r--actionpack/lib/action_dispatch/http/response.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index a370c3f082..d1e1f1fcf6 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -188,8 +188,7 @@ module ActionDispatch # :nodoc:
# information.
def content_type
- type = parse_content_type.mime_type
- type && type.to_s
+ parse_content_type.mime_type
end
def sending_file=(v)