Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

3 files changed, 9 insertions, 9 deletions

diff --git a/spec/uploaders/avatar_uploader_spec.rb b/spec/uploaders/avatar_uploader_spec.rb
index e472ac46e66..bba7eb78f99 100644
--- a/spec/uploaders/avatar_uploader_spec.rb
+++ b/spec/uploaders/avatar_uploader_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe AvatarUploader do
     end
   end
 
-  context 'accept whitelist file content type' do
+  context 'accept allowlist file content type' do
     # We need to feed through a valid path, but we force the parsed mime type
     # in a stub below so we can set any path.
     let_it_be(:path) { File.join('spec', 'fixtures', 'video_sample.mp4') }
@@ -61,13 +61,13 @@ RSpec.describe AvatarUploader do
     end
   end
 
-  context 'upload non-whitelisted file content type' do
+  context 'upload denylisted file content type' do
     let_it_be(:path) { File.join('spec', 'fixtures', 'sanitized.svg') }
 
     it_behaves_like 'denied carrierwave upload'
   end
 
-  context 'upload misnamed non-whitelisted file content type' do
+  context 'upload misnamed denylisted file content type' do
     let_it_be(:path) { File.join('spec', 'fixtures', 'not_a_png.png') }
 
     it_behaves_like 'denied carrierwave upload'
diff --git a/spec/uploaders/design_management/design_v432x230_uploader_spec.rb b/spec/uploaders/design_management/design_v432x230_uploader_spec.rb
index f3dd77d67a0..3991058b32d 100644
--- a/spec/uploaders/design_management/design_v432x230_uploader_spec.rb
+++ b/spec/uploaders/design_management/design_v432x230_uploader_spec.rb
@@ -58,7 +58,7 @@ RSpec.describe DesignManagement::DesignV432x230Uploader do
     )
   end
 
-  context 'accept whitelist file content type' do
+  context 'accept allowlisted file content type' do
     # We need to feed through a valid path, but we force the parsed mime type
     # in a stub below so we can set any path.
     let_it_be(:path) { File.join('spec', 'fixtures', 'dk.png') }
@@ -72,13 +72,13 @@ RSpec.describe DesignManagement::DesignV432x230Uploader do
     end
   end
 
-  context 'upload non-whitelisted file content type' do
+  context 'upload denylisted file content type' do
     let_it_be(:path) { File.join('spec', 'fixtures', 'logo_sample.svg') }
 
     it_behaves_like 'denied carrierwave upload'
   end
 
-  context 'upload misnamed non-whitelisted file content type' do
+  context 'upload misnamed denylisted file content type' do
     let_it_be(:path) { File.join('spec', 'fixtures', 'not_a_png.png') }
 
     it_behaves_like 'denied carrierwave upload'
diff --git a/spec/uploaders/favicon_uploader_spec.rb b/spec/uploaders/favicon_uploader_spec.rb
index 7f452075293..ab14397c27d 100644
--- a/spec/uploaders/favicon_uploader_spec.rb
+++ b/spec/uploaders/favicon_uploader_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe FaviconUploader do
   let_it_be(:model) { build_stubbed(:user) }
   let_it_be(:uploader) { described_class.new(model, :favicon) }
 
-  context 'accept whitelist file content type' do
+  context 'accept allowlist file content type' do
     include_context 'ignore extension allowlist check'
 
     # We need to feed through a valid path, but we force the parsed mime type
@@ -22,7 +22,7 @@ RSpec.describe FaviconUploader do
     end
   end
 
-  context 'upload non-whitelisted file content type' do
+  context 'upload denylisted file content type' do
     include_context 'ignore extension allowlist check'
 
     let_it_be(:path) { File.join('spec', 'fixtures', 'sanitized.svg') }
@@ -30,7 +30,7 @@ RSpec.describe FaviconUploader do
     it_behaves_like 'denied carrierwave upload'
   end
 
-  context 'upload misnamed non-whitelisted file content type' do
+  context 'upload misnamed denylisted file content type' do
     include_context 'ignore extension allowlist check'
 
     let_it_be(:path) { File.join('spec', 'fixtures', 'not_a_png.png') }