Skip to content

Commit

Permalink
Fix ArgumentError when uploading to amazon s3
Browse files Browse the repository at this point in the history
  • Loading branch information
Hiroki Sanpei committed Nov 28, 2018
1 parent 4b5c4ca commit 4deb88c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions 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*
Expand Down
2 changes: 1 addition & 1 deletion activestorage/lib/active_storage/service/s3_service.rb
Expand Up @@ -16,7 +16,7 @@ def initialize(bucket:, upload: {}, **options)
@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))
Expand Down

2 comments on commit 4deb88c

@theswamis
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this! Was going crazy trying to figure it out.

@paulccarey
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 Thanks! 👍

Please sign in to comment.