aboutsummaryrefslogtreecommitdiffstats
path: root/lib/active_storage/service
diff options
context:
space:
mode:
authorGeorge Claghorn <george.claghorn@gmail.com>2017-07-12 12:19:21 -0400
committerGitHub <noreply@github.com>2017-07-12 12:19:21 -0400
commitc55af14d1b50c965d6c1f048ae044952de23aff2 (patch)
tree9d23f8114182bf2675530229f5b991cec74450cf /lib/active_storage/service
parent17906fd22f5c6bbb56f10ee3221a62569fb0d5c6 (diff)
parentafb7047e52dd6dae160b60b74a0c7efaf536933c (diff)
downloadrails-c55af14d1b50c965d6c1f048ae044952de23aff2.tar.gz
rails-c55af14d1b50c965d6c1f048ae044952de23aff2.tar.bz2
rails-c55af14d1b50c965d6c1f048ae044952de23aff2.zip
Merge pull request #42 from quartzmo/gcs-site-url
Update GCSService#url
Diffstat (limited to 'lib/active_storage/service')
-rw-r--r--lib/active_storage/service/gcs_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/active_storage/service/gcs_service.rb b/lib/active_storage/service/gcs_service.rb
index bca4ab5331..0bcd29cab8 100644
--- a/lib/active_storage/service/gcs_service.rb
+++ b/lib/active_storage/service/gcs_service.rb
@@ -44,8 +44,8 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service
def url(key, expires_in:, disposition:, filename:)
instrument :url, key do |payload|
- generated_url = file_for(key).signed_url(expires: expires_in) + "&" +
- { "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }.to_query
+ query = { "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }
+ generated_url = file_for(key).signed_url(expires: expires_in, query: query)
payload[:url] = generated_url