diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-09-08 05:22:12 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-09-08 05:22:12 +0000 |
| commit | cf180734cbabd100641153ca92c086a7da259e9a (patch) | |
| tree | 829d06651d668a42a1dc70067f2a86384aa52e89 | |
| parent | d7ebd5125596f8275cfddd784b9eeaf787a3d5dd (diff) | |
| parent | 6b827490c08b1454a36d9bf3391e29ce10ad5055 (diff) | |
| download | gitlab-ce-cf180734cbabd100641153ca92c086a7da259e9a.tar.gz | |
Merge branch 'bump-fog-google' into 'master'
Bump fog-google to support ADC auth on GCP
Closes gitlab-ee#14810
See merge request gitlab-org/gitlab-ce!32775
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -106,7 +106,7 @@ gem 'fog-aws', '~> 3.5' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.8' +gem 'fog-google', '~> 1.9' gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index 515e1795671..011a365110c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.8.2) + fog-google (1.9.1) fog-core (<= 2.1.0) fog-json (~> 1.2) fog-xml (~> 0.1.0) @@ -1114,7 +1114,7 @@ DEPENDENCIES fog-aliyun (~> 0.3) fog-aws (~> 3.5) fog-core (= 2.1.0) - fog-google (~> 1.8) + fog-google (~> 1.9) fog-local (~> 0.6) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) |