Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 6 deletions

diff --git a/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb b/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb
index 8b93ef86eba..0aaff12f278 100644
--- a/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb
+++ b/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb
@@ -124,7 +124,7 @@ describe Gitlab::SidekiqConfig::CliMethods do
           name: 'a',
           feature_category: :category_a,
           has_external_dependencies: false,
-          urgency: :default,
+          urgency: :low,
           resource_boundary: :cpu
         },
         {
@@ -145,7 +145,7 @@ describe Gitlab::SidekiqConfig::CliMethods do
           name: 'c',
           feature_category: :category_c,
           has_external_dependencies: false,
-          urgency: :none,
+          urgency: :throttled,
           resource_boundary: :memory
         }
       ]
@@ -168,9 +168,9 @@ describe Gitlab::SidekiqConfig::CliMethods do
 
         # urgency
         'urgency=high' | %w(a:2 b)
-        'urgency=default' | %w(a)
-        'urgency=high,default,none' | %w(a a:2 b c)
-        'urgency=default|urgency=none' | %w(a c)
+        'urgency=low' | %w(a)
+        'urgency=high,low,throttled' | %w(a a:2 b c)
+        'urgency=low|urgency=throttled' | %w(a c)
         'urgency!=high' | %w(a c)
 
         # name
diff --git a/spec/lib/gitlab/sidekiq_config/worker_spec.rb b/spec/lib/gitlab/sidekiq_config/worker_spec.rb
index 71fafbf0656..817755e3507 100644
--- a/spec/lib/gitlab/sidekiq_config/worker_spec.rb
+++ b/spec/lib/gitlab/sidekiq_config/worker_spec.rb
@@ -88,7 +88,7 @@ describe Gitlab::SidekiqConfig::Worker do
       attributes_a = {
         feature_category: :source_code_management,
         has_external_dependencies: false,
-        urgency: :default,
+        urgency: :low,
         resource_boundary: :memory,
         weight: 2,
         idempotent: true