Merge branch 'sh-bump-carrierwave-1.3.0' into 'master'
Bump CarrierWave to 1.3.0 and remove monkey patches See merge request gitlab-org/gitlab-ce!24019
Showing
... | ... | @@ -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 | ||
... | ... |
Please register or sign in to comment