diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-11 13:39:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-11 13:39:14 +0000 |
| commit | 5dc5e2c78f8ee966db96ffe31887a90bce650437 (patch) | |
| tree | 9ea0e54e9038c5e7a4c73d65f2ba55c6b44a6983 /config | |
| parent | 37334dd61d5d9d857cea6e58590272e0fbb71a97 (diff) | |
| download | gitlab-ce-5dc5e2c78f8ee966db96ffe31887a90bce650437.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-5-stable-ee
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | config/settings.rb | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 45307c3454b..2244e415c3d 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -814,7 +814,7 @@ end # Settings['sidekiq'] ||= Settingslogic.new({}) Settings['sidekiq']['log_format'] ||= 'default' -Settings['sidekiq']['routing_rules'] = Settings.__send__(:build_sidekiq_routing_rules, Settings['sidekiq']['routing_rules']) +Settings['sidekiq']['routing_rules'] ||= [] # # GitLab Shell diff --git a/config/settings.rb b/config/settings.rb index b242e970cc6..51d54817646 100644 --- a/config/settings.rb +++ b/config/settings.rb @@ -204,11 +204,5 @@ class Settings < Settingslogic "#{minute} #{hour} * * #{day_of_week}" end - - # Route all jobs to 'default' queue. This setting is meant for self-managed instances use to keep things simple. - # See https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1491 - def build_sidekiq_routing_rules(rules) - rules.nil? || rules&.empty? ? [['*', 'default']] : rules - end end end |