Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 6 insertions, 0 deletions

diff --git a/config/settings.rb b/config/settings.rb
index 51d54817646..b242e970cc6 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -204,5 +204,11 @@ 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