summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-12-24 09:14:44 -0800
committerStan Hu <stanhu@gmail.com>2018-12-24 09:24:12 -0800
commite2179093b0e355da70889ee6d7191d33a4d9d687 (patch)
tree0219791b279a00960c4ba3515a5e52cf3365c6ce /Gemfile
parent5dc656fc1f053d397ad1e6c1d85a815f03a5d634 (diff)
downloadgitlab-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')
-rw-r--r--Gemfile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 5ddd1f614f1..c316f3b0e5f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -89,10 +89,7 @@ gem 'kaminari', '~> 1.0'
gem 'hamlit', '~> 2.8.8'
# Files attachments
-# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332 and
-# https://github.com/carrierwaveuploader/carrierwave/pull/2356 are merged.
-# config/initializers/carrierwave_patch.rb can be removed once both changes are released.
-gem 'carrierwave', '= 1.2.3'
+gem 'carrierwave', '~> 1.3'
gem 'mini_magick'
# for backups