aboutsummaryrefslogtreecommitdiffstats
path: root/activestorage
diff options
context:
space:
mode:
authorGraham Conzett <gconzett@orangebarrelmedia.com>2018-10-08 09:50:51 -0400
committerGraham Conzett <gconzett@orangebarrelmedia.com>2018-10-08 09:50:51 -0400
commitbba5ecc923bbc8a635913c1101188163cb9699be (patch)
treed7a3442faa255e1146a5ec49c977eaab92c038e1 /activestorage
parent1986048d27383b0e70264583e8b6922652d6e5c4 (diff)
downloadrails-bba5ecc923bbc8a635913c1101188163cb9699be.tar.gz
rails-bba5ecc923bbc8a635913c1101188163cb9699be.tar.bz2
rails-bba5ecc923bbc8a635913c1101188163cb9699be.zip
Use content_mime_type
Diffstat (limited to 'activestorage')
-rw-r--r--activestorage/app/controllers/active_storage/disk_controller.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activestorage/app/controllers/active_storage/disk_controller.rb b/activestorage/app/controllers/active_storage/disk_controller.rb
index 652084e822..99982202dd 100644
--- a/activestorage/app/controllers/active_storage/disk_controller.rb
+++ b/activestorage/app/controllers/active_storage/disk_controller.rb
@@ -61,7 +61,6 @@ class ActiveStorage::DiskController < ActiveStorage::BaseController
end
def acceptable_content?(token)
- Mime::Type.lookup(request.content_type) == token[:content_type] &&
- token[:content_length] == request.content_length
+ token[:content_type] == request.content_mime_type && token[:content_length] == request.content_length
end
end