diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-11-28 11:28:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 11:28:34 -0500 |
| commit | aaacfd90da00e480d08c60502a1fe65181c5d75e (patch) | |
| tree | 71c75d0e50adda4d6d190f88d657d9af2acdd700 /activestorage | |
| parent | 4b5c4ca377a9b5c75d2c4b4d4f63f53866553b40 (diff) | |
| parent | 4deb88ca2672d536b47bfc5e0477253a3a068601 (diff) | |
| download | rails-aaacfd90da00e480d08c60502a1fe65181c5d75e.tar.gz rails-aaacfd90da00e480d08c60502a1fe65181c5d75e.tar.bz2 rails-aaacfd90da00e480d08c60502a1fe65181c5d75e.zip | |
Merge pull request #34550 from mogulla3/fix-argument-error-when-uploding-to-s3
Fix `ArgumentError` when uploading to amazon s3
Diffstat (limited to 'activestorage')
| -rw-r--r-- | activestorage/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activestorage/lib/active_storage/service/s3_service.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md index ba57315301..ea9b10add9 100644 --- a/activestorage/CHANGELOG.md +++ b/activestorage/CHANGELOG.md @@ -1,3 +1,7 @@ +* Fix `ArgumentError` when uploading to amazon s3 + + *Hiroki Sanpei* + * Add progressive JPG to default list of variable content types *Maurice Kühlborn* diff --git a/activestorage/lib/active_storage/service/s3_service.rb b/activestorage/lib/active_storage/service/s3_service.rb index 89a9e54158..90c3ae1b62 100644 --- a/activestorage/lib/active_storage/service/s3_service.rb +++ b/activestorage/lib/active_storage/service/s3_service.rb @@ -16,7 +16,7 @@ module ActiveStorage @upload_options = upload end - def upload(key, io, checksum: nil) + def upload(key, io, checksum: nil, **) instrument :upload, key: key, checksum: checksum do begin object_for(key).put(upload_options.merge(body: io, content_md5: checksum)) |