diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-07-24 15:13:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 15:13:23 -0400 |
| commit | dc7b650e15d778f56fc363a3689f57702c885399 (patch) | |
| tree | c06b3339d51342dc17d93288bbb1c6cc902f22f7 /activestorage/lib | |
| parent | 0206d9cb7c823fefbf3dfc1d1672be4628986c4e (diff) | |
| parent | 094fa9277d840fe2061f37b9704f81fecdbbe965 (diff) | |
| download | rails-dc7b650e15d778f56fc363a3689f57702c885399.tar.gz rails-dc7b650e15d778f56fc363a3689f57702c885399.tar.bz2 rails-dc7b650e15d778f56fc363a3689f57702c885399.zip | |
Merge pull request #36715 from peterzhu2118/azure-content-type
Add content_type to upload method for Azure
Diffstat (limited to 'activestorage/lib')
| -rw-r--r-- | activestorage/lib/active_storage/service/azure_storage_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activestorage/lib/active_storage/service/azure_storage_service.rb b/activestorage/lib/active_storage/service/azure_storage_service.rb index 993cc0e5f7..8d77e9b20f 100644 --- a/activestorage/lib/active_storage/service/azure_storage_service.rb +++ b/activestorage/lib/active_storage/service/azure_storage_service.rb @@ -17,10 +17,10 @@ module ActiveStorage @container = container end - def upload(key, io, checksum: nil, **) + def upload(key, io, checksum: nil, content_type: nil, **) instrument :upload, key: key, checksum: checksum do handle_errors do - blobs.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum) + blobs.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum, content_type: content_type) end end end |