Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ArgumentError when uploading to amazon s3 #34550

Merged
merged 1 commit into from Nov 28, 2018
Merged

Fix ArgumentError when uploading to amazon s3 #34550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions activestorage/CHANGELOG.md
View file
Open in desktop
@@ -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
View file
Open in desktop
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