summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul B <paul.bonaud@capitainetrain.com>2017-10-23 00:58:59 +0200
committerPaul B <paul.bonaud@capitainetrain.com>2017-10-23 00:58:59 +0200
commitc397bfe2df811cff8b3a5e66fb9e7cb1f36f6bc7 (patch)
treea3095746271ca7fb07e4313b473fa26b41640faa
parent090aefdc246c0b9f2c5381c63c4c5b6ec2e11722 (diff)
downloadgitlab-ce-c397bfe2df811cff8b3a5e66fb9e7cb1f36f6bc7.tar.gz
The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
https://github.com/fog/fog-aliyun/commit/a7456ca6b63e5a0d88c849914679d2fa4707c10c Closes #39126
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 6859ea73e4f..f64cdca31c0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -102,7 +102,7 @@ gem 'fog-google', '~> 0.5'
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
-gem 'fog-aliyun', '~> 0.1.0'
+gem 'fog-aliyun', '~> 0.2.0'
# for Google storage
gem 'google-api-client', '~> 0.13.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 27a76dc36cb..601d5ca16e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -214,7 +214,7 @@ GEM
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
- fog-aliyun (0.1.0)
+ fog-aliyun (0.2.0)
fog-core (~> 1.27)
fog-json (~> 1.0)
ipaddress (~> 0.8)
@@ -1015,7 +1015,7 @@ DEPENDENCIES
flay (~> 2.8.0)
flipper (~> 0.10.2)
flipper-active_record (~> 0.10.2)
- fog-aliyun (~> 0.1.0)
+ fog-aliyun (~> 0.2.0)
fog-aws (~> 1.4)
fog-core (~> 1.44)
fog-google (~> 0.5)