Merge pull request #34550 from mogulla3/fix-argument-error-when-uplod…

…ing-to-s3 Fix `ArgumentError` when uploading to amazon s3
rails · Nov 28, 2018 · aaacfd9 · aaacfd9
2 parents 4b5c4ca + 4deb88c
commit aaacfd9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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))