diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-02-01 09:37:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-01 09:37:08 -0500 |
| commit | 300c62f75cc1b48fe5152717f395ee8d94c1ceaf (patch) | |
| tree | c425fd4839dd35b1b44f9769db174852083ce51d /activestorage/lib | |
| parent | 79bc9e81c3d47be6336223be39cb3bcaeddc0a39 (diff) | |
| parent | c5b71c9baea4959c096774c763e558df2979a9db (diff) | |
| download | rails-300c62f75cc1b48fe5152717f395ee8d94c1ceaf.tar.gz rails-300c62f75cc1b48fe5152717f395ee8d94c1ceaf.tar.bz2 rails-300c62f75cc1b48fe5152717f395ee8d94c1ceaf.zip | |
Merge pull request #35043 from simoleone/activestorage/s3/content-type
include the content type when uploading to S3
Diffstat (limited to 'activestorage/lib')
| -rw-r--r-- | activestorage/lib/active_storage/service/s3_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activestorage/lib/active_storage/service/s3_service.rb b/activestorage/lib/active_storage/service/s3_service.rb index 382920ef61..bf94f3f49e 100644 --- a/activestorage/lib/active_storage/service/s3_service.rb +++ b/activestorage/lib/active_storage/service/s3_service.rb @@ -16,9 +16,9 @@ module ActiveStorage @upload_options = upload end - def upload(key, io, checksum: nil, **) + def upload(key, io, checksum: nil, content_type: nil, **) instrument :upload, key: key, checksum: checksum do - object_for(key).put(upload_options.merge(body: io, content_md5: checksum)) + object_for(key).put(upload_options.merge(body: io, content_md5: checksum, content_type: content_type)) rescue Aws::S3::Errors::BadDigest raise ActiveStorage::IntegrityError end |