summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Ivanov <ivanov.maxim@gmail.com>2019-09-06 20:01:39 +0100
committerMaxim Ivanov <maxim.ivanov@linklaters.com>2019-09-06 20:01:39 +0100
commit6b827490c08b1454a36d9bf3391e29ce10ad5055 (patch)
tree716a586336282b1becc3ded5c17e3f5e99469c02
parent1ffa66effbc9272ac9755ba29fab2fd1b3d93db5 (diff)
downloadgitlab-ce-6b827490c08b1454a36d9bf3391e29ce10ad5055.tar.gz
Bump fog-google to support ADC auth on GCP
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index d080ef67e3a..9f9d8f487fe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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)