diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-14 09:46:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-14 09:46:43 +0000 |
| commit | 744bca3d9f7f46c7547daf1ba8676fd9e4ae7ba8 (patch) | |
| tree | 506429663a990afe5e5f2e0614fc7d23db2049d5 /config | |
| parent | e908d023b55c06a23929b034700d5d06f2efcde8 (diff) | |
| download | gitlab-ce-744bca3d9f7f46c7547daf1ba8676fd9e4ae7ba8.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-4-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 3fc4b56f458..d6e361662e0 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -812,7 +812,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 |