diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-24 12:06:25 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-24 12:06:25 -0500 |
| commit | 6de1c0b7b5c35d0f1a19efc7c9d65af825d977ba (patch) | |
| tree | aeebeae2926b14b7dd3da87facd1222e8a4773c9 /lib/active_storage/service/s3_service.rb | |
| parent | d4f014b927e215f32c2a11839962561b8bd5f50d (diff) | |
| parent | 52eed68e398195e536b99181f644232621f938b3 (diff) | |
| download | rails-6de1c0b7b5c35d0f1a19efc7c9d65af825d977ba.tar.gz rails-6de1c0b7b5c35d0f1a19efc7c9d65af825d977ba.tar.bz2 rails-6de1c0b7b5c35d0f1a19efc7c9d65af825d977ba.zip | |
Merge branch 'master' of github.com:rails/activestorage
Diffstat (limited to 'lib/active_storage/service/s3_service.rb')
| -rw-r--r-- | lib/active_storage/service/s3_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb index 4c17f9902f..72ff9f3f36 100644 --- a/lib/active_storage/service/s3_service.rb +++ b/lib/active_storage/service/s3_service.rb @@ -59,10 +59,10 @@ class ActiveStorage::Service::S3Service < ActiveStorage::Service end end - def url_for_direct_upload(key, expires_in:, content_type:, content_length:) + def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:) instrument :url, key do |payload| generated_url = object_for(key).presigned_url :put, expires_in: expires_in, - content_type: content_type, content_length: content_length + content_type: content_type, content_length: content_length, content_md5: checksum payload[:url] = generated_url |