diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-08 14:18:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-08 14:18:31 +0000 |
| commit | 722211cddfaeba38f678cc523755af1ce645cb5a (patch) | |
| tree | bdafb9786436436c2850707e4ed3ef9d3885f4e0 | |
| parent | 07b32287e51e621d8510f0b8e7103ed47c3b4636 (diff) | |
| parent | f4beec8a9043fbb9782e7b354b46ec1a7af7887e (diff) | |
| download | gitlab-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
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 21 |
2 files changed, 22 insertions, 0 deletions
@@ -86,6 +86,7 @@ gem 'dropzonejs-rails', '~> 0.7.1' # for backups gem 'fog-aws', '~> 0.9' +gem 'fog-azure', '~> 0.0' gem 'fog-core', '~> 1.40' gem 'fog-local', '~> 0.3' gem 'fog-google', '~> 0.3' 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) |