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/system_notes | |
| parent | 4f01ac5ba0bf72427ed4fef9b229d056dbb60e89 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/system_notes')
| -rw-r--r-- | spec/services/system_notes/merge_requests_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/system_notes/merge_requests_service_spec.rb b/spec/services/system_notes/merge_requests_service_spec.rb index cccc2818676..6d2473e8c03 100644 --- a/spec/services/system_notes/merge_requests_service_spec.rb +++ b/spec/services/system_notes/merge_requests_service_spec.rb @@ -14,7 +14,7 @@ describe ::SystemNotes::MergeRequestsService do let(:service) { described_class.new(noteable: noteable, project: project, author: author) } describe '.merge_when_pipeline_succeeds' do - let(:pipeline) { build(:ci_pipeline_without_jobs )} + let(:pipeline) { build(:ci_pipeline) } subject { service.merge_when_pipeline_succeeds(pipeline.sha) } |