Bump carrierwave from 2.1.1 to 2.2.0 (#12802)

* Bump carrierwave from 2.1.1 to 2.2.0

Bumps [carrierwave](https://github.com/carrierwaveuploader/carrierwave) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/carrierwaveuploader/carrierwave/releases)
- [Changelog](https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md)
- [Commits](https://github.com/carrierwaveuploader/carrierwave/compare/v2.1.1...v2.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Replace extension_whitelist with extension_allowlist

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: rhymes <rhymes@hey.com>
This commit is contained in:
dependabot[bot] 2021-02-25 10:53:25 +01:00 committed by GitHub
parent ff10001e86
commit fcce38fb7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 10 additions and 11 deletions

View file

@ -20,7 +20,7 @@ gem "ancestry", "~> 3.2" # Ancestry allows the records of a ActiveRecord model t
gem "blazer", "~> 2.4.2" # Allows admins to query data gem "blazer", "~> 2.4.2" # Allows admins to query data
gem "bootsnap", ">= 1.1.0", require: false # Boot large ruby/rails apps faster gem "bootsnap", ">= 1.1.0", require: false # Boot large ruby/rails apps faster
gem "buffer", "~> 0.1" # Buffer is a Ruby Wrapper for the Buffer API gem "buffer", "~> 0.1" # Buffer is a Ruby Wrapper for the Buffer API
gem "carrierwave", "~> 2.0" # Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends gem "carrierwave", "~> 2.2" # Upload files in your Ruby applications, map them to a range of ORMs, store them on different backends
gem "carrierwave-bombshelter", "~> 0.2" # Protect your carrierwave from image bombs gem "carrierwave-bombshelter", "~> 0.2" # Protect your carrierwave from image bombs
gem "cloudinary", "~> 1.18" # Client library for easily using the Cloudinary service gem "cloudinary", "~> 1.18" # Client library for easily using the Cloudinary service
gem "counter_culture", "~> 2.7" # counter_culture provides turbo-charged counter caches that are kept up-to-date gem "counter_culture", "~> 2.7" # counter_culture provides turbo-charged counter caches that are kept up-to-date

View file

@ -164,7 +164,7 @@ GEM
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0) regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2) xpath (~> 3.2)
carrierwave (2.1.1) carrierwave (2.2.0)
activemodel (>= 5.0.0) activemodel (>= 5.0.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
addressable (~> 2.6) addressable (~> 2.6)
@ -458,7 +458,7 @@ GEM
mini_magick (4.11.0) mini_magick (4.11.0)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.5.0) mini_portile2 (2.5.0)
minitest (5.14.3) minitest (5.14.4)
msgpack (1.4.2) msgpack (1.4.2)
multi_json (1.15.0) multi_json (1.15.0)
multi_xml (0.6.0) multi_xml (0.6.0)
@ -861,7 +861,7 @@ DEPENDENCIES
bullet (~> 6.1) bullet (~> 6.1)
bundler-audit (~> 0.7) bundler-audit (~> 0.7)
capybara (~> 3.35.3) capybara (~> 3.35.3)
carrierwave (~> 2.0) carrierwave (~> 2.2)
carrierwave-bombshelter (~> 0.2) carrierwave-bombshelter (~> 0.2)
cloudinary (~> 1.18) cloudinary (~> 1.18)
counter_culture (~> 2.7) counter_culture (~> 2.7)

View file

@ -1,5 +1,5 @@
class BadgeUploader < BaseUploader class BadgeUploader < BaseUploader
def extension_whitelist def extension_allowlist
%w[jpg jpeg gif png] %w[jpg jpeg gif png]
end end
end end

View file

@ -13,7 +13,7 @@ class BaseUploader < CarrierWave::Uploader::Base
"uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
end end
def extension_whitelist def extension_allowlist
%w[jpg jpeg jpe gif png ico bmp dng] %w[jpg jpeg jpe gif png ico bmp dng]
end end

View file

@ -33,7 +33,6 @@ en:
hello: "Hello world" hello: "Hello world"
errors: &errors errors: &errors
messages: messages:
extension_whitelist_error: 'must be one of the following extensions: .jpg, .jpeg, .jpe, .gif, .png, .ico, .bmp, .dng, or .svg'
bad_uri: is an invalid url bad_uri: is an invalid url
bad_protocol: must start with %{protocols} bad_protocol: must start with %{protocols}
activemodel: activemodel:

View file

@ -42,7 +42,7 @@ describe ArticleImageUploader, type: :uploader do
describe "formats" do describe "formats" do
it "permits a set of extensions" do it "permits a set of extensions" do
expect(uploader.extension_whitelist).to eq(%w[jpg jpeg jpe gif png ico bmp dng]) expect(uploader.extension_allowlist).to eq(%w[jpg jpeg jpe gif png ico bmp dng])
end end
it "permits jpegs" do it "permits jpegs" do

View file

@ -32,7 +32,7 @@ describe BadgeUploader, type: :uploader do
describe "formats" do describe "formats" do
it "permits a set of extensions" do it "permits a set of extensions" do
expect(uploader.extension_whitelist).to eq(%w[jpg jpeg gif png]) expect(uploader.extension_allowlist).to eq(%w[jpg jpeg gif png])
end end
it "permits jpegs" do it "permits jpegs" do

View file

@ -32,7 +32,7 @@ describe CoverImageUploader, type: :uploader do
describe "formats" do describe "formats" do
it "permits a set of extensions" do it "permits a set of extensions" do
expect(uploader.extension_whitelist).to eq(%w[jpg jpeg jpe gif png ico bmp dng]) expect(uploader.extension_allowlist).to eq(%w[jpg jpeg jpe gif png ico bmp dng])
end end
it "permits jpegs" do it "permits jpegs" do

View file

@ -50,7 +50,7 @@ describe ProfileImageUploader, type: :uploader do
describe "formats" do describe "formats" do
it "permits a set of extensions" do it "permits a set of extensions" do
expect(uploader.extension_whitelist).to eq(%w[jpg jpeg jpe gif png ico bmp dng]) expect(uploader.extension_allowlist).to eq(%w[jpg jpeg jpe gif png ico bmp dng])
end end
it "permits jpegs" do it "permits jpegs" do

Binary file not shown.

BIN
vendor/cache/carrierwave-2.2.0.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/minitest-5.14.4.gem vendored Normal file

Binary file not shown.