diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2017-08-26 11:52:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-26 11:52:50 -0400 |
| commit | a8bc4bd41edab5175514d9195b87d76e646a388a (patch) | |
| tree | b22eae531b819e2c40bb6f83788953c205471936 /activestorage/lib/active_storage/service/disk_service.rb | |
| parent | 114d4e05900f1d3dee094338ddd764c0537f9a74 (diff) | |
| parent | 9e470b24c8869ac739a438132cdd5648bc6fe333 (diff) | |
| download | rails-a8bc4bd41edab5175514d9195b87d76e646a388a.tar.gz rails-a8bc4bd41edab5175514d9195b87d76e646a388a.tar.bz2 rails-a8bc4bd41edab5175514d9195b87d76e646a388a.zip | |
Merge pull request #30424 from koic/fix_order_of_active_storage_disk_url_parameters
Fix order of Active Storage DiskService URL parameters
Diffstat (limited to 'activestorage/lib/active_storage/service/disk_service.rb')
| -rw-r--r-- | activestorage/lib/active_storage/service/disk_service.rb | 2 |
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 |