diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 11:11:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 11:11:44 +0000 |
commit | 25989ab7ef1a444ed2abd5479f176d58e1d9462a (patch) | |
tree | 271bb24f3c7178f320cb9de0be0833a285327d09 /app/workers/concerns | |
parent | 9bbb32b29703f3ce33dd35d5101145774b793a6d (diff) | |
download | gitlab-ce-25989ab7ef1a444ed2abd5479f176d58e1d9462a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/concerns')
-rw-r--r-- | app/workers/concerns/application_worker.rb | 1 | ||||
-rw-r--r-- | app/workers/concerns/auto_devops_queue.rb | 1 | ||||
-rw-r--r-- | app/workers/concerns/chaos_queue.rb | 1 | ||||
-rw-r--r-- | app/workers/concerns/cluster_queue.rb | 1 | ||||
-rw-r--r-- | app/workers/concerns/gitlab/github_import/object_importer.rb | 2 | ||||
-rw-r--r-- | app/workers/concerns/gitlab/github_import/queue.rb | 1 | ||||
-rw-r--r-- | app/workers/concerns/object_pool_queue.rb | 1 | ||||
-rw-r--r-- | app/workers/concerns/pipeline_background_queue.rb | 1 | ||||
-rw-r--r-- | app/workers/concerns/pipeline_queue.rb | 1 | ||||
-rw-r--r-- | app/workers/concerns/repository_check_queue.rb | 2 | ||||
-rw-r--r-- | app/workers/concerns/todos_destroyer_queue.rb | 1 |
11 files changed, 12 insertions, 1 deletions
diff --git a/app/workers/concerns/application_worker.rb b/app/workers/concerns/application_worker.rb index 2b36ccb8304..62748808ff1 100644 --- a/app/workers/concerns/application_worker.rb +++ b/app/workers/concerns/application_worker.rb @@ -8,6 +8,7 @@ module ApplicationWorker extend ActiveSupport::Concern include Sidekiq::Worker # rubocop:disable Cop/IncludeSidekiqWorker + include WorkerAttributes included do set_queue diff --git a/app/workers/concerns/auto_devops_queue.rb b/app/workers/concerns/auto_devops_queue.rb index aba928ccaab..61e3c1544bd 100644 --- a/app/workers/concerns/auto_devops_queue.rb +++ b/app/workers/concerns/auto_devops_queue.rb @@ -5,5 +5,6 @@ module AutoDevopsQueue included do queue_namespace :auto_devops + feature_category :auto_devops end end diff --git a/app/workers/concerns/chaos_queue.rb b/app/workers/concerns/chaos_queue.rb index e406509d12d..c5db10491f2 100644 --- a/app/workers/concerns/chaos_queue.rb +++ b/app/workers/concerns/chaos_queue.rb @@ -5,5 +5,6 @@ module ChaosQueue included do queue_namespace :chaos + feature_category :chaos_engineering end end diff --git a/app/workers/concerns/cluster_queue.rb b/app/workers/concerns/cluster_queue.rb index e44b40c36c9..180b86b0124 100644 --- a/app/workers/concerns/cluster_queue.rb +++ b/app/workers/concerns/cluster_queue.rb @@ -8,5 +8,6 @@ module ClusterQueue included do queue_namespace :gcp_cluster + feature_category :kubernetes_configuration end end diff --git a/app/workers/concerns/gitlab/github_import/object_importer.rb b/app/workers/concerns/gitlab/github_import/object_importer.rb index eeeff6e93a0..b856a9329dd 100644 --- a/app/workers/concerns/gitlab/github_import/object_importer.rb +++ b/app/workers/concerns/gitlab/github_import/object_importer.rb @@ -12,6 +12,8 @@ module Gitlab include GithubImport::Queue include ReschedulingMethods include NotifyUponDeath + + feature_category :importers end # project - An instance of `Project` to import the data into. diff --git a/app/workers/concerns/gitlab/github_import/queue.rb b/app/workers/concerns/gitlab/github_import/queue.rb index 59b621f16ab..7cc23dd7c0b 100644 --- a/app/workers/concerns/gitlab/github_import/queue.rb +++ b/app/workers/concerns/gitlab/github_import/queue.rb @@ -7,6 +7,7 @@ module Gitlab included do queue_namespace :github_importer + feature_category :importers # If a job produces an error it may block a stage from advancing # forever. To prevent this from happening we prevent jobs from going to diff --git a/app/workers/concerns/object_pool_queue.rb b/app/workers/concerns/object_pool_queue.rb index 5b648df9c72..c2e84470fba 100644 --- a/app/workers/concerns/object_pool_queue.rb +++ b/app/workers/concerns/object_pool_queue.rb @@ -8,5 +8,6 @@ module ObjectPoolQueue included do queue_namespace :object_pool + feature_category :gitaly end end diff --git a/app/workers/concerns/pipeline_background_queue.rb b/app/workers/concerns/pipeline_background_queue.rb index bbb8ad0c982..0a23780b807 100644 --- a/app/workers/concerns/pipeline_background_queue.rb +++ b/app/workers/concerns/pipeline_background_queue.rb @@ -8,5 +8,6 @@ module PipelineBackgroundQueue included do queue_namespace :pipeline_background + feature_category :continuous_integration end end diff --git a/app/workers/concerns/pipeline_queue.rb b/app/workers/concerns/pipeline_queue.rb index 3aaed4669e5..27cbf6eb61c 100644 --- a/app/workers/concerns/pipeline_queue.rb +++ b/app/workers/concerns/pipeline_queue.rb @@ -8,5 +8,6 @@ module PipelineQueue included do queue_namespace :pipeline_default + feature_category :continuous_integration end end diff --git a/app/workers/concerns/repository_check_queue.rb b/app/workers/concerns/repository_check_queue.rb index 216d67e5dbc..76f6e1c2e91 100644 --- a/app/workers/concerns/repository_check_queue.rb +++ b/app/workers/concerns/repository_check_queue.rb @@ -6,7 +6,7 @@ module RepositoryCheckQueue included do queue_namespace :repository_check - sidekiq_options retry: false + feature_category :source_code_management end end diff --git a/app/workers/concerns/todos_destroyer_queue.rb b/app/workers/concerns/todos_destroyer_queue.rb index 8e2b1d30579..1bbccbfb1f9 100644 --- a/app/workers/concerns/todos_destroyer_queue.rb +++ b/app/workers/concerns/todos_destroyer_queue.rb @@ -8,5 +8,6 @@ module TodosDestroyerQueue included do queue_namespace :todos_destroyer + feature_category :issue_tracking end end |