diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2017-11-29 09:25:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 09:25:27 -0500 |
| commit | 5211c0dd8cc84d9458713ca55a4a8afe12f7df40 (patch) | |
| tree | f234e3a0228bfc006ef1529f14e91c063e7b1efa /activestorage | |
| parent | f4c08d14995ba9d5caf0f209d3a95308f93bec6a (diff) | |
| parent | 9d65ac30fde3977d4773ff6052f31b99a5084f0f (diff) | |
| download | rails-5211c0dd8cc84d9458713ca55a4a8afe12f7df40.tar.gz rails-5211c0dd8cc84d9458713ca55a4a8afe12f7df40.tar.bz2 rails-5211c0dd8cc84d9458713ca55a4a8afe12f7df40.zip | |
Merge pull request #31272 from y-yagi/use_credentials_instead_of_keyfile_in_gcs
Use `credentials` instead of `keyfile` in GCS sevice
Diffstat (limited to 'activestorage')
| -rw-r--r-- | activestorage/lib/active_storage/service/gcs_service.rb | 2 | ||||
| -rw-r--r-- | activestorage/test/service/configurations.example.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activestorage/lib/active_storage/service/gcs_service.rb b/activestorage/lib/active_storage/service/gcs_service.rb index be6ddf32a0..fd9916634a 100644 --- a/activestorage/lib/active_storage/service/gcs_service.rb +++ b/activestorage/lib/active_storage/service/gcs_service.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +gem "google-cloud-storage", "~> 1.8" + require "google/cloud/storage" require "active_support/core_ext/object/to_query" diff --git a/activestorage/test/service/configurations.example.yml b/activestorage/test/service/configurations.example.yml index 56ed37be5d..43cc013bc8 100644 --- a/activestorage/test/service/configurations.example.yml +++ b/activestorage/test/service/configurations.example.yml @@ -7,7 +7,7 @@ # # gcs: # service: GCS -# keyfile: { +# credentials: { # type: "service_account", # project_id: "", # private_key_id: "", |