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
Showing
... | @@ -106,7 +106,7 @@ gem 'fog-aws', '~> 3.5' | ... | @@ -106,7 +106,7 @@ gem 'fog-aws', '~> 3.5' |
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. | # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. | ||
# Also see config/initializers/fog_core_patch.rb. | # Also see config/initializers/fog_core_patch.rb. | ||
gem 'fog-core', '= 2.1.0' | gem 'fog-core', '= 2.1.0' | ||
gem 'fog-google', '~> 1.8' | gem 'fog-google', '~> 1.9' | ||
gem 'fog-local', '~> 0.6' | gem 'fog-local', '~> 0.6' | ||
gem 'fog-openstack', '~> 1.0' | gem 'fog-openstack', '~> 1.0' | ||
gem 'fog-rackspace', '~> 0.1.1' | gem 'fog-rackspace', '~> 0.1.1' | ||
... | ... |
Please register or sign in to comment