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
This commit is contained in:
commit
c4cbf115db
2 changed files with 3 additions and 3 deletions
2
Gemfile
2
Gemfile
|
@ -102,7 +102,7 @@ gem 'fog-google', '~> 0.5'
|
||||||
gem 'fog-local', '~> 0.3'
|
gem 'fog-local', '~> 0.3'
|
||||||
gem 'fog-openstack', '~> 0.1'
|
gem 'fog-openstack', '~> 0.1'
|
||||||
gem 'fog-rackspace', '~> 0.1.1'
|
gem 'fog-rackspace', '~> 0.1.1'
|
||||||
gem 'fog-aliyun', '~> 0.1.0'
|
gem 'fog-aliyun', '~> 0.2.0'
|
||||||
|
|
||||||
# for Google storage
|
# for Google storage
|
||||||
gem 'google-api-client', '~> 0.13.6'
|
gem 'google-api-client', '~> 0.13.6'
|
||||||
|
|
|
@ -214,7 +214,7 @@ GEM
|
||||||
flowdock (0.7.1)
|
flowdock (0.7.1)
|
||||||
httparty (~> 0.7)
|
httparty (~> 0.7)
|
||||||
multi_json
|
multi_json
|
||||||
fog-aliyun (0.1.0)
|
fog-aliyun (0.2.0)
|
||||||
fog-core (~> 1.27)
|
fog-core (~> 1.27)
|
||||||
fog-json (~> 1.0)
|
fog-json (~> 1.0)
|
||||||
ipaddress (~> 0.8)
|
ipaddress (~> 0.8)
|
||||||
|
@ -1015,7 +1015,7 @@ DEPENDENCIES
|
||||||
flay (~> 2.8.0)
|
flay (~> 2.8.0)
|
||||||
flipper (~> 0.10.2)
|
flipper (~> 0.10.2)
|
||||||
flipper-active_record (~> 0.10.2)
|
flipper-active_record (~> 0.10.2)
|
||||||
fog-aliyun (~> 0.1.0)
|
fog-aliyun (~> 0.2.0)
|
||||||
fog-aws (~> 1.4)
|
fog-aws (~> 1.4)
|
||||||
fog-core (~> 1.44)
|
fog-core (~> 1.44)
|
||||||
fog-google (~> 0.5)
|
fog-google (~> 0.5)
|
||||||
|
|
Loading…
Reference in a new issue