Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2024-01-02 07:04:07 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2024-01-02 07:04:07 +0300
commit90d76d8023038c2f5d1587e0a70b85256ea0f08a (patch)
tree6efc4f0f17e015b58f16aeb48bebe05f2ef3f166 /spec/initializers
parente6b6ac769bd034aeb14d312db923fc5a2ae1fb89 (diff)
Add latest changes from gitlab-org/gitlab@16-7-stable-ee
Diffstat (limited to 'spec/initializers')
-rw-r--r--spec/initializers/sidekiq_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/initializers/sidekiq_spec.rb b/spec/initializers/sidekiq_spec.rb
index a034e628d25..fb1377244d2 100644
--- a/spec/initializers/sidekiq_spec.rb
+++ b/spec/initializers/sidekiq_spec.rb
@@ -78,11 +78,13 @@ RSpec.describe 'sidekiq', feature_category: :build do
end
around do |example|
+ Gitlab::SidekiqConfig.clear_memoization(:cron_jobs)
original_settings = Gitlab.config['cron_jobs']
Gitlab.config['cron_jobs'] = cron_jobs_settings
example.run
+ Gitlab::SidekiqConfig.clear_memoization(:cron_jobs)
Gitlab.config['cron_jobs'] = original_settings
end