diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | lib/active_storage/service/gcs_service.rb | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -9,4 +9,4 @@ gem 'sqlite3' gem 'httparty' gem 'aws-sdk', '~> 2', require: false -gem 'google-cloud-storage', require: false +gem 'google-cloud-storage', '~> 1.3', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 7e4c6f78f2..56290db48d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,9 +69,9 @@ GEM google-cloud-core (1.0.0) google-cloud-env (~> 1.0) googleauth (~> 0.5.1) - google-cloud-env (1.0.0) + google-cloud-env (1.0.1) faraday (~> 0.11) - google-cloud-storage (1.2.0) + google-cloud-storage (1.3.0) digest-crc (~> 0.4) google-api-client (~> 0.13.0) google-cloud-core (~> 1.0) @@ -141,7 +141,7 @@ DEPENDENCIES aws-sdk (~> 2) bundler (~> 1.15) byebug - google-cloud-storage + google-cloud-storage (~> 1.3) httparty rake sqlite3 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 |