summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2017-06-19 16:37:37 -0600
committerConnor Shea <connor.james.shea@gmail.com>2017-06-19 16:37:37 -0600
commiteb4657992c46652d33bcb9abbe0576b939073137 (patch)
tree1979cecbd08e202149c7db2334bf680193678c82 /Gemfile.lock
parent025cbc2ad4dc175634676ff8a6955e043512d8bf (diff)
downloadgitlab-ce-eb4657992c46652d33bcb9abbe0576b939073137.tar.gz
Update carrierwave from 1.0.0 to 1.1.0.
Changelog: https://github.com/carrierwaveuploader/carrierwave/blob/f2f8569b1013f601fe7be4b3a616359acd27240d/CHANGELOG.md#110---2017-04-30 Adds support for Rails 5.1
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 6755c75e331..259e18c15b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,7 +108,7 @@ GEM
capybara-screenshot (1.0.14)
capybara (>= 1.0, < 3)
launchy
- carrierwave (1.0.0)
+ carrierwave (1.1.0)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
@@ -932,7 +932,7 @@ DEPENDENCIES
bundler-audit (~> 0.5.0)
capybara (~> 2.6.2)
capybara-screenshot (~> 1.0.0)
- carrierwave (~> 1.0)
+ carrierwave (~> 1.1)
charlock_holmes (~> 0.7.3)
chronic (~> 0.10.2)
chronic_duration (~> 0.10.6)
@@ -1119,4 +1119,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.15.0
+ 1.15.1