diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-23 17:50:31 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-23 17:50:31 -0500 |
| commit | 5944850bc1259ca42381ce83d155ddd914b968c6 (patch) | |
| tree | a8579cc18b2d412a978b02385f15a22c56dd3ac4 /app/models/active_storage/service/s3_service.rb | |
| parent | cb2f7d499466acd2a8c9b917262914e46b5bf104 (diff) | |
| download | rails-5944850bc1259ca42381ce83d155ddd914b968c6.tar.gz rails-5944850bc1259ca42381ce83d155ddd914b968c6.tar.bz2 rails-5944850bc1259ca42381ce83d155ddd914b968c6.zip | |
Tell service which content-type to use for the response
Diffstat (limited to 'app/models/active_storage/service/s3_service.rb')
| -rw-r--r-- | app/models/active_storage/service/s3_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/active_storage/service/s3_service.rb b/app/models/active_storage/service/s3_service.rb index efffdec157..4c17f9902f 100644 --- a/app/models/active_storage/service/s3_service.rb +++ b/app/models/active_storage/service/s3_service.rb @@ -47,10 +47,11 @@ class ActiveStorage::Service::S3Service < ActiveStorage::Service end end - def url(key, expires_in:, disposition:, filename:) + def url(key, expires_in:, disposition:, filename:, content_type:) instrument :url, key do |payload| generated_url = object_for(key).presigned_url :get, expires_in: expires_in, - response_content_disposition: "#{disposition}; filename=\"#{filename}\"" + response_content_disposition: "#{disposition}; filename=\"#{filename}\"", + response_content_type: content_type payload[:url] = generated_url |