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 | |
| 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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/39580-bump-carrierwave-to-1-2-1.yml | 5 |
3 files changed, 8 insertions, 3 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' diff --git a/Gemfile.lock b/Gemfile.lock index 0a94a9ce497..4142977285e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,7 +107,7 @@ GEM capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy - carrierwave (1.1.0) + carrierwave (1.2.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -990,7 +990,7 @@ DEPENDENCIES bundler-audit (~> 0.5.0) capybara (~> 2.15.0) capybara-screenshot (~> 1.0.0) - carrierwave (~> 1.1) + carrierwave (~> 1.2) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) diff --git a/changelogs/unreleased/39580-bump-carrierwave-to-1-2-1.yml b/changelogs/unreleased/39580-bump-carrierwave-to-1-2-1.yml new file mode 100644 index 00000000000..bda85ac24e0 --- /dev/null +++ b/changelogs/unreleased/39580-bump-carrierwave-to-1-2-1.yml @@ -0,0 +1,5 @@ +--- +title: Bump carrierwave to 1.2.1 +merge_request: 15072 +author: Takuya Noguchi +type: other |