diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-05-07 09:12:59 +0300 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-05-07 09:12:59 +0300 |
commit | 552e9f748b7dc38c83d1c2fafdb0e5f07ac830f5 (patch) | |
tree | ab47b3daaf17f94bbb00ed44fd3723d8eabd4b41 /app | |
parent | b32798ac41380e9e0167e1a98dfed7920ab360fd (diff) | |
parent | 7c2b1cb0c3c598994559180059a87fc44bfda5c8 (diff) |
Merge branch 'fix-schedule-head-pipeline-update-method' into 'master'
Fix update head pipeline process of Pipelines for merge requests
See merge request gitlab-org/gitlab-ce!28057
Diffstat (limited to 'app')
-rw-r--r-- | app/services/ci/create_pipeline_service.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index 252f5778644..c17712355af 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -104,17 +104,11 @@ module Ci end def schedule_head_pipeline_update - related_merge_requests.each do |merge_request| + pipeline.all_merge_requests.opened.each do |merge_request| UpdateHeadPipelineForMergeRequestWorker.perform_async(merge_request.id) end end - # rubocop: disable CodeReuse/ActiveRecord - def related_merge_requests - pipeline.project.source_of_merge_requests.opened.where(source_branch: pipeline.ref) - end - # rubocop: enable CodeReuse/ActiveRecord - def extra_options(options = {}) # In Ruby 2.4, even when options is empty, f(**options) doesn't work when f # doesn't have any parameters. We reproduce the Ruby 2.5 behavior by |