summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2017-05-01 20:15:16 +0000
committerDouwe Maan <douwe@gitlab.com>2017-05-01 20:15:16 +0000
commitd261f83626b9abde93f91d9850ae3e989348e12d (patch)
tree269301ab963afab0056c68300d2c7bbd64b114a2 /Gemfile
parent3d318f3c92d2e6ff8d03c94015bacf44c2542fdd (diff)
downloadgitlab-ce-d261f83626b9abde93f91d9850ae3e989348e12d.tar.gz
Update Carrierwave and fog-core
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 41c2dcfd76e..f54a1f500fd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -85,14 +85,14 @@ gem 'kaminari', '~> 0.17.0'
gem 'hamlit', '~> 2.6.1'
# Files attachments
-gem 'carrierwave', '~> 0.11.0'
+gem 'carrierwave', '~> 1.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-core', '~> 1.44'
gem 'fog-google', '~> 0.5'
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'