diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-06 21:44:00 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-06 21:44:00 +0300 |
| commit | 35f6efaee05835b75e605e1f269e57a8d6daf3fa (patch) | |
| tree | 2668a26de16f8608266dcb49d9e85bb64cbe2909 /app | |
| parent | ee2cfd0f5a30582bd8588fe8a0196dfb887f3a0a (diff) | |
| parent | f0dac7297918b15e38bb5f373e414916a4b898d2 (diff) | |
Merge branch 'move-pipeline_default-update_head_pipeline_for_merge_request-queue-to-pipeline_processing-namespace' into 'master'
Move update_head_pipeline_for_merge_request queue to `pipeline_processing` namespace
Closes #43919
See merge request gitlab-org/gitlab-ce!17572
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/all_queues.yml | 2 | ||||
| -rw-r--r-- | app/workers/update_head_pipeline_for_merge_request_worker.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 9962eaccade..f65e8385ac8 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -48,7 +48,6 @@ - pipeline_default:build_trace_sections - pipeline_default:pipeline_metrics - pipeline_default:pipeline_notification -- pipeline_default:update_head_pipeline_for_merge_request - pipeline_hooks:build_hooks - pipeline_hooks:pipeline_hooks - pipeline_processing:build_finished @@ -58,6 +57,7 @@ - pipeline_processing:pipeline_success - pipeline_processing:pipeline_update - pipeline_processing:stage_update +- pipeline_processing:update_head_pipeline_for_merge_request - repository_check:repository_check_clear - repository_check:repository_check_single_repository 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 f09d89aa170..76f84ff920f 100644 --- a/app/workers/update_head_pipeline_for_merge_request_worker.rb +++ b/app/workers/update_head_pipeline_for_merge_request_worker.rb @@ -2,6 +2,8 @@ class UpdateHeadPipelineForMergeRequestWorker include ApplicationWorker include PipelineQueue + queue_namespace :pipeline_processing + def perform(merge_request_id) merge_request = MergeRequest.find(merge_request_id) pipeline = Ci::Pipeline.where(project: merge_request.source_project, ref: merge_request.source_branch).last |