diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 21:13:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 21:13:03 +0300 |
| commit | 29f6c0bff81cae77435342e46d1f439ac16a57d1 (patch) | |
| tree | 9e48603e2818e9c56ac937743fd23f1d0fcf6529 /spec/spec_helper.rb | |
| parent | b962adf4c32f2371ad0d8bfcdc444933943d3cd9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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 |