summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2017-10-29 21:19:40 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2017-10-30 15:37:16 +0900
commita718a59bf6fa81bbc51242267c56a4895629304c (patch)
treea53084dd78bc8c21a2c781fa9fd5ad1d02a18fa4 /Gemfile.lock
parent6d7384f59525e2d54c30011237499c27bde145ef (diff)
downloadgitlab-ce-a718a59bf6fa81bbc51242267c56a4895629304c.tar.gz
Bump carrierwave to 1.2.1
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 53efb1c76c2..e4a323dde7b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -107,7 +107,7 @@ GEM
capybara-screenshot (1.0.14)
capybara (>= 1.0, < 3)
launchy
- carrierwave (1.1.0)
+ carrierwave (1.2.1)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
@@ -990,7 +990,7 @@ DEPENDENCIES
bundler-audit (~> 0.5.0)
capybara (~> 2.15.0)
capybara-screenshot (~> 1.0.0)
- carrierwave (~> 1.1)
+ carrierwave (~> 1.2)
charlock_holmes (~> 0.7.5)
chronic (~> 0.10.2)
chronic_duration (~> 0.10.6)