diff --git a/Gemfile b/Gemfile
index 79bd8eeb9..da52b88a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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 "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 "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 "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
diff --git a/Gemfile.lock b/Gemfile.lock
index 7386ee984..1a2877be2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -164,7 +164,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (2.1.1)
+    carrierwave (2.2.0)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
       addressable (~> 2.6)
@@ -458,7 +458,7 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     msgpack (1.4.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -861,7 +861,7 @@ DEPENDENCIES
   bullet (~> 6.1)
   bundler-audit (~> 0.7)
   capybara (~> 3.35.3)
-  carrierwave (~> 2.0)
+  carrierwave (~> 2.2)
   carrierwave-bombshelter (~> 0.2)
   cloudinary (~> 1.18)
   counter_culture (~> 2.7)
diff --git a/app/uploaders/badge_uploader.rb b/app/uploaders/badge_uploader.rb
index 026475933..c070ee336 100644
--- a/app/uploaders/badge_uploader.rb
+++ b/app/uploaders/badge_uploader.rb
@@ -1,5 +1,5 @@
 class BadgeUploader < BaseUploader
-  def extension_whitelist
+  def extension_allowlist
     %w[jpg jpeg gif png]
   end
 end
diff --git a/app/uploaders/base_uploader.rb b/app/uploaders/base_uploader.rb
index 708943b9a..2061b4b9c 100644
--- a/app/uploaders/base_uploader.rb
+++ b/app/uploaders/base_uploader.rb
@@ -13,7 +13,7 @@ class BaseUploader < CarrierWave::Uploader::Base
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
-  def extension_whitelist
+  def extension_allowlist
     %w[jpg jpeg jpe gif png ico bmp dng]
   end
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b7c252fe4..c814e6ee3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -33,7 +33,6 @@ en:
   hello: "Hello world"
   errors: &errors
     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_protocol: must start with %{protocols}
   activemodel:
diff --git a/spec/uploaders/article_image_uploader_spec.rb b/spec/uploaders/article_image_uploader_spec.rb
index 9dc877271..d9cb46d75 100644
--- a/spec/uploaders/article_image_uploader_spec.rb
+++ b/spec/uploaders/article_image_uploader_spec.rb
@@ -42,7 +42,7 @@ describe ArticleImageUploader, type: :uploader do
 
   describe "formats" 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
 
     it "permits jpegs" do
diff --git a/spec/uploaders/badge_uploader_spec.rb b/spec/uploaders/badge_uploader_spec.rb
index fb7885e81..4d8bfe141 100644
--- a/spec/uploaders/badge_uploader_spec.rb
+++ b/spec/uploaders/badge_uploader_spec.rb
@@ -32,7 +32,7 @@ describe BadgeUploader, type: :uploader do
 
   describe "formats" 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
 
     it "permits jpegs" do
diff --git a/spec/uploaders/cover_image_uploader_spec.rb b/spec/uploaders/cover_image_uploader_spec.rb
index 3cc417742..e489be1e4 100644
--- a/spec/uploaders/cover_image_uploader_spec.rb
+++ b/spec/uploaders/cover_image_uploader_spec.rb
@@ -32,7 +32,7 @@ describe CoverImageUploader, type: :uploader do
 
   describe "formats" 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
 
     it "permits jpegs" do
diff --git a/spec/uploaders/profile_image_uploader_spec.rb b/spec/uploaders/profile_image_uploader_spec.rb
index 302b36a2d..7cc9375ba 100644
--- a/spec/uploaders/profile_image_uploader_spec.rb
+++ b/spec/uploaders/profile_image_uploader_spec.rb
@@ -50,7 +50,7 @@ describe ProfileImageUploader, type: :uploader do
 
   describe "formats" 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
 
     it "permits jpegs" do
diff --git a/vendor/cache/carrierwave-2.1.1.gem b/vendor/cache/carrierwave-2.1.1.gem
deleted file mode 100644
index 39ed8e30d..000000000
Binary files a/vendor/cache/carrierwave-2.1.1.gem and /dev/null differ
diff --git a/vendor/cache/carrierwave-2.2.0.gem b/vendor/cache/carrierwave-2.2.0.gem
new file mode 100644
index 000000000..1d000086f
Binary files /dev/null and b/vendor/cache/carrierwave-2.2.0.gem differ
diff --git a/vendor/cache/minitest-5.14.3.gem b/vendor/cache/minitest-5.14.3.gem
deleted file mode 100644
index 8cb7218a6..000000000
Binary files a/vendor/cache/minitest-5.14.3.gem and /dev/null differ
diff --git a/vendor/cache/minitest-5.14.4.gem b/vendor/cache/minitest-5.14.4.gem
new file mode 100644
index 000000000..6a7369480
Binary files /dev/null and b/vendor/cache/minitest-5.14.4.gem differ