diff options
author | Stan Hu <stanhu@gmail.com> | 2018-12-24 09:14:44 -0800 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-12-24 09:24:12 -0800 |
commit | e2179093b0e355da70889ee6d7191d33a4d9d687 (patch) | |
tree | 0219791b279a00960c4ba3515a5e52cf3365c6ce /Gemfile.lock | |
parent | 5dc656fc1f053d397ad1e6c1d85a815f03a5d634 (diff) | |
download | gitlab-ce-e2179093b0e355da70889ee6d7191d33a4d9d687.tar.gz |
Bump CarrierWave to 1.3.0 and remove monkey patches
Full list of changes:
https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f2d265d835c..942dbac27a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,7 +108,7 @@ GEM capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy - carrierwave (1.2.3) + carrierwave (1.3.0) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -965,7 +965,7 @@ DEPENDENCIES bundler-audit (~> 0.5.0) capybara (~> 2.15) capybara-screenshot (~> 1.0.0) - carrierwave (= 1.2.3) + carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) |