diff options
author | Stan Hu <stanhu@gmail.com> | 2017-10-23 03:17:33 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-10-23 03:17:33 +0000 |
commit | c4cbf115db1ca719b97677057b984672a0900bf8 (patch) | |
tree | a3095746271ca7fb07e4313b473fa26b41640faa | |
parent | 090aefdc246c0b9f2c5381c63c4c5b6ec2e11722 (diff) | |
parent | c397bfe2df811cff8b3a5e66fb9e7cb1f36f6bc7 (diff) | |
download | gitlab-ce-c4cbf115db1ca719b97677057b984672a0900bf8.tar.gz |
Merge branch 'fix-fog-aliyun-39126' into 'master'
The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This…
Closes #39126
See merge request gitlab-org/gitlab-ce!14991
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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) |