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

eileencodes · web-flow · commit aaacfd90da00 · 2018-11-28T11:28:34.000-05:00
Fix `ArgumentError` when uploading to amazon s3
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))
