aboutsummaryrefslogtreecommitdiffstats
path: root/activestorage/lib
diff options
context:
space:
mode:
authorKoichi ITO <koic.ito@gmail.com>2017-08-26 23:15:14 +0900
committerKoichi ITO <koic.ito@gmail.com>2017-08-26 23:16:07 +0900
commit9e470b24c8869ac739a438132cdd5648bc6fe333 (patch)
treeb22eae531b819e2c40bb6f83788953c205471936 /activestorage/lib
parent114d4e05900f1d3dee094338ddd764c0537f9a74 (diff)
downloadrails-9e470b24c8869ac739a438132cdd5648bc6fe333.tar.gz
rails-9e470b24c8869ac739a438132cdd5648bc6fe333.tar.bz2
rails-9e470b24c8869ac739a438132cdd5648bc6fe333.zip
Fix order of Active Storage DiskService URL parameters
`content_type` parameter is before `disposition` parameter.
Diffstat (limited to 'activestorage/lib')
-rw-r--r--activestorage/lib/active_storage/service/disk_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activestorage/lib/active_storage/service/disk_service.rb b/activestorage/lib/active_storage/service/disk_service.rb
index 5aa8d74a5a..f600753a08 100644
--- a/activestorage/lib/active_storage/service/disk_service.rb
+++ b/activestorage/lib/active_storage/service/disk_service.rb
@@ -66,7 +66,7 @@ module ActiveStorage
verified_key_with_expiration,
filename: filename, disposition: disposition, content_type: content_type
else
- "/rails/active_storage/disk/#{verified_key_with_expiration}/#{filename}?disposition=#{disposition}&content_type=#{content_type}"
+ "/rails/active_storage/disk/#{verified_key_with_expiration}/#{filename}?content_type=#{content_type}&disposition=#{disposition}"
end
payload[:url] = generated_url