diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-06 09:01:31 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-06 09:01:31 +0000 |
| commit | 67a94b2ff3b0d714549c7d30b3c6212f3046a3c2 (patch) | |
| tree | 9d99b4db7f5cbfbcb8e6143ac79d18403437ab45 /spec/presenters | |
| parent | f92292815868a67db53059cbe8e7607cc4891f47 (diff) | |
| parent | b328cff308431fd28a779f9356c9a43351de2754 (diff) | |
| download | gitlab-ce-67a94b2ff3b0d714549c7d30b3c6212f3046a3c2.tar.gz | |
Merge branch '37354-pipelines-update' into 'master'
Make sure head pippeline always corresponds with an MR
Closes #37354
See merge request gitlab-org/gitlab-ce!14358
Diffstat (limited to 'spec/presenters')
| -rw-r--r-- | spec/presenters/merge_request_presenter_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/presenters/merge_request_presenter_spec.rb b/spec/presenters/merge_request_presenter_spec.rb index 5e114434a67..f325d1776e4 100644 --- a/spec/presenters/merge_request_presenter_spec.rb +++ b/spec/presenters/merge_request_presenter_spec.rb @@ -31,7 +31,7 @@ describe MergeRequestPresenter do let(:pipeline) { build_stubbed(:ci_pipeline) } before do - allow(resource).to receive(:head_pipeline).and_return(pipeline) + allow(resource).to receive(:actual_head_pipeline).and_return(pipeline) end context 'success with warnings' do |