summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-04 21:08:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-04 21:08:11 +0000
commit37c8b3b44e6d3f5755e45b3db6913fab7fee5c89 (patch)
tree84efcb091ad4ac27861c1c23fa93cd24f76c0744 /Gemfile
parent00ecf5debe240ed6d2aeed89b1f637ba6c418417 (diff)
downloadgitlab-ce-37c8b3b44e6d3f5755e45b3db6913fab7fee5c89.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 7d63a5f50c0..8137b66c283 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,14 +112,14 @@ 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.9'
+gem 'fog-google', '~> 1.10'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.3'
# for Google storage
-gem 'google-api-client', '~> 0.23'
+gem 'google-api-client', '~> 0.33'
# for aws storage
gem 'unf', '~> 0.1.4'