diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-29 12:31:57 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-29 12:31:57 +0000 |
| commit | a4eef82e30bc08257b85c8a5124d1d7860276c96 (patch) | |
| tree | a47d36c2502005045f9659ba3b7c2822414e210f | |
| parent | ad09fcb5b95478cbf7075c6add11cf4fc3430db2 (diff) | |
| parent | 49edb2e0f9edf0f717aae78a246efdd23ea08724 (diff) | |
| download | gitlab-ce-a4eef82e30bc08257b85c8a5124d1d7860276c96.tar.gz | |
Merge branch 'fograckspace' into 'master'
Add fog-rackspace microgem to support backups using rackspace provider
## What does this MR do?
Adds fog-rackspace gem to Gemfile.
## Why was this MR needed?
Because fog moved the rackspace provider to separate gem.
## What are the relevant issue numbers?
#19197
See merge request !4986
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -91,6 +91,7 @@ gem 'fog-core', '~> 1.40' gem 'fog-local', '~> 0.3' gem 'fog-google', '~> 0.3' gem 'fog-openstack', '~> 0.1' +gem 'fog-rackspace', '~> 0.1.1' # for aws storage gem "unf", '~> 0.1.4' diff --git a/Gemfile.lock b/Gemfile.lock index c1d2f1fdf5a..4c5350ba639 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,6 +243,11 @@ GEM fog-core (>= 1.39) fog-json (>= 1.0) ipaddress (>= 0.8) + fog-rackspace (0.1.1) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) @@ -858,6 +863,7 @@ DEPENDENCIES fog-google (~> 0.3) fog-local (~> 0.3) fog-openstack (~> 0.1) + fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.6.1) foreman fuubar (~> 2.0.0) |