aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-07-04 16:46:07 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2017-07-04 16:46:07 +0200
commit4dc60aabcc3785cff8cf9da9265f07b55843f8b0 (patch)
tree91befb38a8d04244b4f9c49969c9eb30ebea8956
parentefd950ae706cfbb55dffebd5d0c85e30acfd7a45 (diff)
downloadrails-4dc60aabcc3785cff8cf9da9265f07b55843f8b0.tar.gz
rails-4dc60aabcc3785cff8cf9da9265f07b55843f8b0.tar.bz2
rails-4dc60aabcc3785cff8cf9da9265f07b55843f8b0.zip
Disposition is a header, not part of a URL
-rw-r--r--lib/active_file/blob.rb4
-rw-r--r--lib/active_file/site/disk_site.rb2
-rw-r--r--lib/active_file/site/s3_site.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/active_file/blob.rb b/lib/active_file/blob.rb
index 4af0551f99..bf34aac794 100644
--- a/lib/active_file/blob.rb
+++ b/lib/active_file/blob.rb
@@ -33,8 +33,8 @@ class ActiveFile::Blob < ActiveRecord::Base
ActiveFile::Filename.new(self[:filename])
end
- def url(disposition: :inline, expires_in: 5.minutes)
- site.url key, disposition: disposition, expires_in: expires_in
+ def url(expires_in: 5.minutes)
+ site.url key, expires_in: expires_in
end
diff --git a/lib/active_file/site/disk_site.rb b/lib/active_file/site/disk_site.rb
index 1fa77029c7..f9aab475aa 100644
--- a/lib/active_file/site/disk_site.rb
+++ b/lib/active_file/site/disk_site.rb
@@ -38,7 +38,7 @@ class ActiveFile::Site::DiskSite < ActiveFile::Site
end
- def url(key, disposition:, expires_in: nil)
+ def url(key, expires_in: nil)
verified_key_with_expiration = ActiveFile::VerifiedKeyWithExpiration.encode(key, expires_in: expires_in)
if defined?(Rails)
diff --git a/lib/active_file/site/s3_site.rb b/lib/active_file/site/s3_site.rb
index 7bb8197245..e407f84861 100644
--- a/lib/active_file/site/s3_site.rb
+++ b/lib/active_file/site/s3_site.rb
@@ -29,7 +29,7 @@ class ActiveFile::Site::S3Site < ActiveFile::Site
end
- def url(key, disposition: :inline, expires_in: nil)
+ def url(key, expires_in: nil)
object_for(key).presigned_url(:get, expires_in: expires_in)
end