diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-06 18:09:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-06 18:09:38 +0000 |
| commit | 73886079f3f877ffb8f8938d700643a5e99bc849 (patch) | |
| tree | ff8f3c64df680962c1da38156e8c1e63a015b0fb /app/workers | |
| parent | a7beadc83470bd9ce23757a019795f49f95a6fff (diff) | |
| download | gitlab-ce-73886079f3f877ffb8f8938d700643a5e99bc849.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/all_queues.yml | 2 | ||||
| -rw-r--r-- | app/workers/update_head_pipeline_for_merge_request_worker.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index ccac944605d..6809d818717 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -849,7 +849,7 @@ :urgency: :high :resource_boundary: :cpu :weight: 5 - :idempotent: + :idempotent: true - :name: repository_check:repository_check_batch :feature_category: :source_code_management :has_external_dependencies: diff --git a/app/workers/update_head_pipeline_for_merge_request_worker.rb b/app/workers/update_head_pipeline_for_merge_request_worker.rb index 69698ba81bd..63d11d33283 100644 --- a/app/workers/update_head_pipeline_for_merge_request_worker.rb +++ b/app/workers/update_head_pipeline_for_merge_request_worker.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class UpdateHeadPipelineForMergeRequestWorker # rubocop:disable Scalability/IdempotentWorker +class UpdateHeadPipelineForMergeRequestWorker include ApplicationWorker include PipelineQueue @@ -9,6 +9,8 @@ class UpdateHeadPipelineForMergeRequestWorker # rubocop:disable Scalability/Idem urgency :high worker_resource_boundary :cpu + idempotent! + def perform(merge_request_id) MergeRequest.find_by_id(merge_request_id).try do |merge_request| merge_request.update_head_pipeline |