summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-03-05 14:48:36 +0000
committerDouwe Maan <douwe@gitlab.com>2016-03-05 14:48:36 +0000
commit28bee175dbdba8bb0ca04887d6f8d5c4d727a0bd (patch)
tree75b78a37b2059472a6e5e65fd5affef01cf64a14 /Gemfile.lock
parent14df110b78e0fb7f6e45fff5e4ce65ef2d91ea60 (diff)
parent71a2303567c6295a6ee64357d90408b91e0079c4 (diff)
downloadgitlab-ce-28bee175dbdba8bb0ca04887d6f8d5c4d727a0bd.tar.gz
Merge branch 'issue_2805' into 'master'
Upgrade carrierwave to 0.10.0. Closes #2805 See merge request !3084
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 246334f0b5c..22c86e4ae8f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,10 +117,11 @@ GEM
capybara-screenshot (1.0.11)
capybara (>= 1.0, < 3)
launchy
- carrierwave (0.9.0)
+ carrierwave (0.10.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
+ mime-types (>= 1.16)
cause (0.1)
charlock_holmes (0.7.3)
chunky_png (1.3.5)
@@ -898,7 +899,7 @@ DEPENDENCIES
cal-heatmap-rails (~> 3.5.0)
capybara (~> 2.4.0)
capybara-screenshot (~> 1.0.0)
- carrierwave (~> 0.9.0)
+ carrierwave (~> 0.10.0)
charlock_holmes (~> 0.7.3)
coffee-rails (~> 4.1.0)
colorize (~> 0.7.0)