kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #34550 from mogulla3/fix-argument-error-when-uploding-to-s3

Browse source 
Fix `ArgumentError` when uploading to amazon s3
This commit is contained in:
Eileen M. Uchitelle 2018-11-28 11:28:34 -05:00 committed by GitHub
commit aaacfd90da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activestorage/CHANGELOG.md
View file

@ -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*

2
activestorage/lib/active_storage/service/s3_service.rb
View file

@ -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))