summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 15:08:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 15:08:44 +0000
commit120f4aaedc8fe830a3f572491d240d8ee6addefb (patch)
treea2138baa55dfa67d292fb1a83ce686ee7f5d10a5 /app/workers
parent729e3765d5feb762df1ccfbc228a8dd4662aa3f9 (diff)
downloadgitlab-ce-120f4aaedc8fe830a3f572491d240d8ee6addefb.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/all_queues.yml2
-rw-r--r--app/workers/background_migration_worker.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index cae4bb73e04..c101759ff9b 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -928,7 +928,7 @@
:weight: 2
:idempotent: true
- :name: background_migration
- :feature_category: :not_owned
+ :feature_category: :database
:has_external_dependencies:
:urgency: :low
:resource_boundary: :unknown
diff --git a/app/workers/background_migration_worker.rb b/app/workers/background_migration_worker.rb
index 231c2bcd83b..f5fd73156b3 100644
--- a/app/workers/background_migration_worker.rb
+++ b/app/workers/background_migration_worker.rb
@@ -3,7 +3,7 @@
class BackgroundMigrationWorker # rubocop:disable Scalability/IdempotentWorker
include ApplicationWorker
- feature_category_not_owned!
+ feature_category :database
# The minimum amount of time between processing two jobs of the same migration
# class.