From a27bb77482988af58f0abd7b296fb9f5adf0d693 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 8 Sep 2015 16:08:13 -0700
Subject: [PATCH] mime_type will always return a string

---
 actionpack/lib/action_dispatch/http/response.rb | 3 +--
 1 file changed, 1 insertion(+), 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)