summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-06-02 16:35:42 +0000
committerRobert Speicher <robert@gitlab.com>2016-06-02 16:35:42 +0000
commite6389dfee621090706d43d3107339934ca42f0ff (patch)
tree1a67bf62480f2dbf5df2916e97638b06189a81e3 /Gemfile
parent61cfda255f42160e2deeb5c37dd7b97b858863e6 (diff)
parente5bb417cdef7d78d128a03295a34b9752ee73d35 (diff)
downloadgitlab-ce-e6389dfee621090706d43d3107339934ca42f0ff.tar.gz
Merge branch 'reduce-fog-deps' into 'master'
Reduce number of fog gem dependencies Currently supported: * AWS * Azure * OpenStack * Google * local storage Closes #15352 See merge request !4396
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 0ab78c2a738..d9429de786f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -83,8 +83,14 @@ gem "carrierwave", '~> 0.10.0'
# Drag and Drop UI
gem 'dropzonejs-rails', '~> 0.7.1'
+# for backups
+gem 'fog-aws', '~> 0.9'
+gem 'fog-core', '~> 1.40'
+gem 'fog-local', '~> 0.3'
+gem 'fog-google', '~> 0.3'
+gem 'fog-openstack', '~> 0.1'
+
# for aws storage
-gem "fog", "~> 1.36.0"
gem "unf", '~> 0.1.4'
# Authorization