summaryrefslogtreecommitdiff
path: root/app/workers/object_pool/join_worker.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-30 15:14:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-30 15:14:17 +0000
commit3fe9588b1c1c4fb58f8ba8e9c27244fc2fc1c103 (patch)
treed19448d010ff9d58fed14846736ee358fb6b3327 /app/workers/object_pool/join_worker.rb
parentad8eea383406037a207c80421e6e4bfa357f8044 (diff)
downloadgitlab-ce-3fe9588b1c1c4fb58f8ba8e9c27244fc2fc1c103.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/object_pool/join_worker.rb')
-rw-r--r--app/workers/object_pool/join_worker.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/workers/object_pool/join_worker.rb b/app/workers/object_pool/join_worker.rb
index 9c5161fd55a..ddd002eabb8 100644
--- a/app/workers/object_pool/join_worker.rb
+++ b/app/workers/object_pool/join_worker.rb
@@ -5,6 +5,8 @@ module ObjectPool
include ApplicationWorker
include ObjectPoolQueue
+ worker_resource_boundary :cpu
+
# The use of pool id is deprecated. Keeping the argument allows old jobs to
# still be performed.
def perform(_pool_id, project_id)