summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-31 16:51:58 +0000
committerRémy Coutable <remy@rymai.me>2017-10-31 16:51:58 +0000
commit01c954922490d222b072efe621f3231161d39108 (patch)
treef03fee9a91af65bef924f19ceaa2ad1e2e364b21 /Gemfile
parentb86c3a73655f858e9da60475058ff1387eb18798 (diff)
parenta718a59bf6fa81bbc51242267c56a4895629304c (diff)
downloadgitlab-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--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index f9719749bbc..c97b1896d06 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'