diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-03-01 09:18:08 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-13 15:26:38 +0300 |
| commit | b913169d887bab6b02469cac4d245e2612deb76d (patch) | |
| tree | eee24e23e630ea0a026aac0e521380a02910bf2a /spec/factories | |
| parent | 77d22d3721ce3be4a2924b08db638e7be1bb9710 (diff) | |
Make all_pipelines method compatible with pipelines for merge requests
Make it sane
Include merge ref head
Fix union
Improve a bit
Add spec
remove
add spec
Add changelog
fix coding offence
Apply suggestion to spec/models/merge_request_spec.rb
ok
ok
Fix
Fix spec
Fix spec
fix
Simplify the things
Memoize
OK
a
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/merge_requests.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index 18f724770b5..ecd7ea65fb7 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -106,7 +106,9 @@ FactoryBot.define do merge_request.merge_request_pipelines << build(:ci_pipeline, source: :merge_request_event, merge_request: merge_request, - project: merge_request.source_project) + project: merge_request.source_project, + ref: merge_request.source_branch, + sha: merge_request.source_branch_sha) end end |