diff options
author | Rémy Coutable <remy@rymai.me> | 2017-10-31 16:51:58 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-10-31 16:51:58 +0000 |
commit | 01c954922490d222b072efe621f3231161d39108 (patch) | |
tree | f03fee9a91af65bef924f19ceaa2ad1e2e364b21 /Gemfile | |
parent | b86c3a73655f858e9da60475058ff1387eb18798 (diff) | |
parent | a718a59bf6fa81bbc51242267c56a4895629304c (diff) | |
download | gitlab-ce-01c954922490d222b072efe621f3231161d39108.tar.gz |
Merge branch '39580-bump-carrierwave-to-1-2-1' into 'master'
Bump carrierwave to 1.2.1
Closes #39580
See merge request gitlab-org/gitlab-ce!15072
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -90,7 +90,7 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.6.1' # Files attachments -gem 'carrierwave', '~> 1.1' +gem 'carrierwave', '~> 1.2' # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' |