diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 03:09:39 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 03:09:39 +0000 |
| commit | 52cacdb89bb29f355e0c3a33c3250ac2d3fea036 (patch) | |
| tree | 106e4128d0b9e454f60287c9895fc2182e82db21 /spec/features/projects | |
| parent | 9398d718d92a40a0a917040645a55dea51467a91 (diff) | |
| download | gitlab-ce-52cacdb89bb29f355e0c3a33c3250ac2d3fea036.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/projects')
| -rw-r--r-- | spec/features/projects/pipelines/pipeline_spec.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb index 561c0552007..e8846b5b617 100644 --- a/spec/features/projects/pipelines/pipeline_spec.rb +++ b/spec/features/projects/pipelines/pipeline_spec.rb @@ -133,15 +133,8 @@ describe 'Pipeline', :js do context 'when there are two related merge requests' do before do - create(:merge_request, - source_project: project, - source_branch: pipeline.ref, - target_branch: 'feature-1') - - create(:merge_request, - source_project: project, - source_branch: pipeline.ref, - target_branch: 'feature-2') + create(:merge_request, source_project: project, source_branch: pipeline.ref) + create(:merge_request, source_project: project, source_branch: pipeline.ref, target_branch: 'fix') end it 'links to the most recent related merge request' do |