diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-19 17:22:46 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-19 17:22:46 +0200 |
| commit | 8af809104f371f7243e551a39fc4b9dd15dcd08a (patch) | |
| tree | 9f8bc7d0ecb91e115d3f3c849ea97bdbc102e199 | |
| parent | e0cc2db08ff23244bb7eebe2bc7e6c51c2c85525 (diff) | |
| download | gitlab-ce-async-pipeline-processing.tar.gz | |
Fix async processingasync-pipeline-processing
| -rw-r--r-- | app/models/commit_status.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index e2009b9194b..73bcf6a37f0 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -73,7 +73,7 @@ class CommitStatus < ActiveRecord::Base if commit_status.pipeline && !transition.loopback? ProcessPipelineWorker.perform_async( commit_status.pipeline.id, - process: HasStatus.COMPLETED_STATUSES.include?(commit_status.status)) + process: COMPLETED_STATUSES.include?(commit_status.status)) end true diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 0243124b483..9b30f22c21f 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -56,7 +56,7 @@ module MergeRequests end def each_merge_request(pipeline) - merge_request_from(commit_status).each do |merge_request| + merge_request_from(pipeline).each do |merge_request| next unless pipeline == merge_request.pipeline yield merge_request |