From 29f6c0bff81cae77435342e46d1f439ac16a57d1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 20 Sep 2022 18:13:03 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/spec_helper.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'spec/spec_helper.rb') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c75f651fb92..4bc8c0b88eb 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -407,8 +407,7 @@ RSpec.configure do |config| with_sidekiq_server_middleware do |chain| Gitlab::SidekiqMiddleware.server_configurator( metrics: false, # The metrics don't go anywhere in tests - arguments_logger: false, # We're not logging the regular messages for inline jobs - memory_killer: false # This is not a thing we want to do inline in tests + arguments_logger: false # We're not logging the regular messages for inline jobs ).call(chain) chain.add DisableQueryLimit chain.insert_after ::Gitlab::SidekiqMiddleware::RequestStoreMiddleware, IsolatedRequestStore -- cgit v1.2.3