Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
096b36805c
commit
808d6775dd
2
Gemfile
2
Gemfile
|
@ -130,7 +130,7 @@ gem 'fog-local', '~> 0.6'
|
|||
gem 'fog-openstack', '~> 1.0'
|
||||
gem 'fog-rackspace', '~> 0.1.1'
|
||||
gem 'fog-aliyun', '~> 0.3'
|
||||
gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm'
|
||||
gem 'gitlab-fog-azure-rm', '~> 1.3.0', require: 'fog/azurerm'
|
||||
|
||||
# for Google storage
|
||||
gem 'google-api-client', '~> 0.33'
|
||||
|
|
|
@ -479,7 +479,7 @@ GEM
|
|||
gitlab-experiment (0.7.1)
|
||||
activesupport (>= 3.0)
|
||||
request_store (>= 1.0)
|
||||
gitlab-fog-azure-rm (1.2.0)
|
||||
gitlab-fog-azure-rm (1.3.0)
|
||||
azure-storage-blob (~> 2.0)
|
||||
azure-storage-common (~> 2.0)
|
||||
fog-core (= 2.1.0)
|
||||
|
@ -1503,7 +1503,7 @@ DEPENDENCIES
|
|||
gitlab-chronic (~> 0.10.5)
|
||||
gitlab-dangerfiles (~> 3.0)
|
||||
gitlab-experiment (~> 0.7.1)
|
||||
gitlab-fog-azure-rm (~> 1.2.0)
|
||||
gitlab-fog-azure-rm (~> 1.3.0)
|
||||
gitlab-labkit (~> 0.22.0)
|
||||
gitlab-license (~> 2.1.0)
|
||||
gitlab-license_finder (~> 6.0)
|
||||
|
|
Loading…
Reference in New Issue