Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

6 files changed, 6 insertions, 13 deletions

diff --git a/spec/config/application_spec.rb b/spec/config/application_spec.rb
index 94fecc26e7f..7b64ad4a9b9 100644
--- a/spec/config/application_spec.rb
+++ b/spec/config/application_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Application do # rubocop:disable RSpec/FilePath
+RSpec.describe Gitlab::Application, feature_category: :scalability do # rubocop:disable RSpec/FilePath
   using RSpec::Parameterized::TableSyntax
 
   filtered_param = ActiveSupport::ParameterFilter::FILTERED
diff --git a/spec/config/inject_enterprise_edition_module_spec.rb b/spec/config/inject_enterprise_edition_module_spec.rb
index 96fc26fc80a..47cb36c569e 100644
--- a/spec/config/inject_enterprise_edition_module_spec.rb
+++ b/spec/config/inject_enterprise_edition_module_spec.rb
@@ -2,7 +2,7 @@
 
 require 'fast_spec_helper'
 
-RSpec.describe InjectEnterpriseEditionModule do
+RSpec.describe InjectEnterpriseEditionModule, feature_category: :fulfillment_developer_productivity do
   let(:extension_name) { 'FF' }
   let(:extension_namespace) { Module.new }
   let(:fish_name) { 'Fish' }
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb
index ec306837361..cf2146bdf77 100644
--- a/spec/config/mail_room_spec.rb
+++ b/spec/config/mail_room_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'mail_room.yml' do
+RSpec.describe 'mail_room.yml', feature_category: :service_desk do
   include StubENV
 
   let(:mailroom_config_path) { 'config/mail_room.yml' }
diff --git a/spec/config/object_store_settings_spec.rb b/spec/config/object_store_settings_spec.rb
index 9275c809550..7b4fa495288 100644
--- a/spec/config/object_store_settings_spec.rb
+++ b/spec/config/object_store_settings_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('config', 'object_store_settings.rb')
 
-RSpec.describe ObjectStoreSettings do
+RSpec.describe ObjectStoreSettings, feature_category: :not_owned do
   describe '#parse!' do
     let(:settings) { Settingslogic.new(config) }
 
@@ -70,7 +70,6 @@ RSpec.describe ObjectStoreSettings do
         expect(settings.artifacts['object_store']['enabled']).to be true
         expect(settings.artifacts['object_store']['connection']).to eq(connection)
         expect(settings.artifacts['object_store']['direct_upload']).to be true
-        expect(settings.artifacts['object_store']['background_upload']).to be false
         expect(settings.artifacts['object_store']['proxy_download']).to be false
         expect(settings.artifacts['object_store']['remote_directory']).to eq('artifacts')
         expect(settings.artifacts['object_store']['bucket_prefix']).to eq(nil)
@@ -81,7 +80,6 @@ RSpec.describe ObjectStoreSettings do
         expect(settings.lfs['object_store']['enabled']).to be true
         expect(settings.lfs['object_store']['connection']).to eq(connection)
         expect(settings.lfs['object_store']['direct_upload']).to be true
-        expect(settings.lfs['object_store']['background_upload']).to be false
         expect(settings.lfs['object_store']['proxy_download']).to be true
         expect(settings.lfs['object_store']['remote_directory']).to eq('lfs-objects')
         expect(settings.lfs['object_store']['bucket_prefix']).to eq(nil)
@@ -200,7 +198,6 @@ RSpec.describe ObjectStoreSettings do
             'enabled' => true,
             'remote_directory' => 'some-bucket',
             'direct_upload' => false,
-            'background_upload' => true,
             'proxy_download' => false
           }
         end
@@ -215,9 +212,7 @@ RSpec.describe ObjectStoreSettings do
           expect(settings.artifacts['object_store']).to be_nil
           expect(settings.lfs['object_store']['remote_directory']).to eq('some-bucket')
           expect(settings.lfs['object_store']['bucket_prefix']).to eq(nil)
-          # Disable background_upload, regardless of the input config
           expect(settings.lfs['object_store']['direct_upload']).to eq(true)
-          expect(settings.lfs['object_store']['background_upload']).to eq(false)
           expect(settings.external_diffs['object_store']).to be_nil
         end
       end
@@ -230,7 +225,6 @@ RSpec.describe ObjectStoreSettings do
 
       expect(settings['enabled']).to be false
       expect(settings['direct_upload']).to be true
-      expect(settings['background_upload']).to be false
       expect(settings['remote_directory']).to be nil
       expect(settings['bucket_prefix']).to be nil
     end
@@ -245,7 +239,6 @@ RSpec.describe ObjectStoreSettings do
 
       expect(settings['enabled']).to be true
       expect(settings['direct_upload']).to be true
-      expect(settings['background_upload']).to be false
       expect(settings['remote_directory']).to eq 'artifacts'
       expect(settings['bucket_prefix']).to be nil
     end
diff --git a/spec/config/settings_spec.rb b/spec/config/settings_spec.rb
index fe2081fa5de..4917b043812 100644
--- a/spec/config/settings_spec.rb
+++ b/spec/config/settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Settings do
+RSpec.describe Settings, feature_category: :authentication_and_authorization do
   describe 'omniauth' do
     it 'defaults to enabled' do
       expect(described_class.omniauth.enabled).to be true
diff --git a/spec/config/smime_signature_settings_spec.rb b/spec/config/smime_signature_settings_spec.rb
index 5ce6fdd975b..477ad4a74ed 100644
--- a/spec/config/smime_signature_settings_spec.rb
+++ b/spec/config/smime_signature_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe SmimeSignatureSettings do
+RSpec.describe SmimeSignatureSettings, feature_category: :not_owned do
   describe '.parse' do
     let(:default_smime_key) { Rails.root.join('.gitlab_smime_key') }
     let(:default_smime_cert) { Rails.root.join('.gitlab_smime_cert') }