Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

2 files changed, 3 insertions, 7 deletions

diff --git a/spec/config/inject_enterprise_edition_module_spec.rb b/spec/config/inject_enterprise_edition_module_spec.rb
index 47cb36c569e..e8c0905ff89 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, feature_category: :fulfillment_developer_productivity do
+RSpec.describe InjectEnterpriseEditionModule, feature_category: :not_owned 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 cf2146bdf77..a3806fb3cb6 100644
--- a/spec/config/mail_room_spec.rb
+++ b/spec/config/mail_room_spec.rb
@@ -27,11 +27,6 @@ RSpec.describe 'mail_room.yml', feature_category: :service_desk do
 
   before do
     stub_env('GITLAB_REDIS_QUEUES_CONFIG_FILE', absolute_path(queues_config_path))
-    redis_clear_raw_config!(Gitlab::Redis::Queues)
-  end
-
-  after do
-    redis_clear_raw_config!(Gitlab::Redis::Queues)
   end
 
   context 'when incoming email is disabled' do
@@ -57,6 +52,7 @@ RSpec.describe 'mail_room.yml', feature_category: :service_desk do
         password: '[REDACTED]',
         name: 'inbox',
         idle_timeout: 60,
+        delete_after_delivery: true,
         expunge_deleted: true
       }
       expected_options = {
@@ -81,7 +77,7 @@ RSpec.describe 'mail_room.yml', feature_category: :service_desk do
         email: 'gitlab-incoming@gmail.com',
         name: 'inbox',
         idle_timeout: 60,
-        expunge_deleted: true
+        delete_after_delivery: false
       }
       expected_options = {
         redis_url: gitlab_redis_queues.url,