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 /app | |
| 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 'app')
| -rw-r--r-- | app/models/active_storage/blob.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/active_storage/blob.rb b/app/models/active_storage/blob.rb index 8f810203e2..7e388f69ba 100644 --- a/app/models/active_storage/blob.rb +++ b/app/models/active_storage/blob.rb @@ -115,7 +115,7 @@ class ActiveStorage::Blob < ActiveRecord::Base # Returns a URL that can be used to directly upload a file for this blob on the service. This URL is intended to be # short-lived for security and only generated on-demand by the client-side JavaScript responsible for doing the uploading. def service_url_for_direct_upload(expires_in: 5.minutes) - service.url_for_direct_upload key, expires_in: expires_in, content_type: content_type, content_length: byte_size + service.url_for_direct_upload key, expires_in: expires_in, content_type: content_type, content_length: byte_size, checksum: checksum end |