diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 15:06:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 15:06:22 +0300 |
| commit | 4e516dbff9767a35677fdc4a6e39005b4b564376 (patch) | |
| tree | 7c650b30777b8e7f72cafb186e9446a50d3fa3be /spec/services/auto_merge | |
| parent | 4f01ac5ba0bf72427ed4fef9b229d056dbb60e89 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/auto_merge')
| -rw-r--r-- | spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb b/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb index 1bebeacb4d4..f2cda999932 100644 --- a/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb +++ b/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb @@ -13,8 +13,7 @@ describe AutoMerge::MergeWhenPipelineSucceedsService do end let(:pipeline) do - create(:ci_pipeline_with_one_job, ref: mr_merge_if_green_enabled.source_branch, - project: project) + create(:ci_pipeline, ref: mr_merge_if_green_enabled.source_branch, project: project) end let(:service) do |