diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-06 13:19:50 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-06 13:19:50 +0300 |
| commit | 9824a69c8a4028b757a3d13d7ed4251589d20589 (patch) | |
| tree | 7ea94ccdb9da0ad605df7a310dfe207d360fad59 /app/services/merge_requests/base_service.rb | |
| parent | 217244074fbf78e2aabe1a5019ae0e9c0501e258 (diff) | |
Fix tests and code for MWBS event move to pipeline
Diffstat (limited to 'app/services/merge_requests/base_service.rb')
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index a726dd98697..4f4c1c77ec3 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -56,12 +56,18 @@ module MergeRequests def pipeline_merge_requests(pipeline) merge_requests_for(pipeline.ref, pipeline.sha).each do |merge_request| + next unless pipeline == merge_request.pipeline + yield merge_request end end def commit_status_merge_requests(commit_status) merge_requests_for(commit_status.ref, commit_status.sha).each do |merge_request| + pipeline = merge_request.pipeline + next unless pipeline + next unless pipeline.sha == commit_status.sha + yield merge_request end end |