diff --git a/Gemfile b/Gemfile index 5adba4d58df4e841b5382fa9ce1e3c28e061d674..dd9146511b81869687d917bccda94bc55216ce98 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' diff --git a/Gemfile.lock b/Gemfile.lock index 53efb1c76c2532bfdd047825219be0c25ced9e96..e4a323dde7b300a6844694a1b1a4de0d3cd73049 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 0000000000000000000000000000000000000000..bda85ac24e0369fd8400a50a05f72cbbc42fd45c --- /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