summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-06-08 14:18:31 +0000
committerRémy Coutable <remy@rymai.me>2016-06-08 14:18:31 +0000
commit722211cddfaeba38f678cc523755af1ce645cb5a (patch)
treebdafb9786436436c2850707e4ed3ef9d3885f4e0 /Gemfile.lock
parent07b32287e51e621d8510f0b8e7103ed47c3b4636 (diff)
parentf4beec8a9043fbb9782e7b354b46ec1a7af7887e (diff)
downloadgitlab-ce-722211cddfaeba38f678cc523755af1ce645cb5a.tar.gz
Merge branch 'support-fog-azure' into 'master'
Add fog-azure to supported backup list !4396 left out Azure by accident. See merge request !4444
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock21
1 files changed, 21 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 28de59beec7..dfc15700494 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,6 +70,21 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
+ azure (0.7.5)
+ addressable (~> 2.3)
+ azure-core (~> 0.1)
+ faraday (~> 0.9)
+ faraday_middleware (~> 0.10)
+ json (~> 1.8)
+ mime-types (>= 1, < 3.0)
+ nokogiri (~> 1.6)
+ systemu (~> 2.6)
+ thor (~> 0.19)
+ uuid (~> 2.0)
+ azure-core (0.1.2)
+ faraday (~> 0.9)
+ faraday_middleware (~> 0.10)
+ nokogiri (~> 1.6)
babosa (1.0.2)
base32 (0.3.2)
bcrypt (3.1.11)
@@ -213,6 +228,11 @@ GEM
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
+ fog-azure (0.0.2)
+ azure (~> 0.6)
+ fog-core (~> 1.27)
+ fog-json (~> 1.0)
+ fog-xml (~> 0.1)
fog-core (1.40.0)
builder
excon (~> 0.49)
@@ -856,6 +876,7 @@ DEPENDENCIES
flay
flog
fog-aws (~> 0.9)
+ fog-azure (~> 0.0)
fog-core (~> 1.40)
fog-google (~> 0.3)
fog-local (~> 0.3)