diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-20 14:38:34 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-20 14:41:23 -0500 |
| commit | 86b75f4713fa6cb14cbf443c1e29ca6384204b65 (patch) | |
| tree | b03a720469d9db3bb853fb0e6898a71563864c00 /spec | |
| parent | 7d347ae564c137bd8b133dd4d589b089bde931a5 (diff) | |
| download | gitlab-ce-86b75f4713fa6cb14cbf443c1e29ca6384204b65.tar.gz | |
Use a MR with commits.
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb index 449cecaa789..de9fed2b7dd 100644 --- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb +++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb @@ -6,7 +6,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do let(:mr_merge_if_green_enabled) do create(:merge_request, merge_when_build_succeeds: true, merge_user: user, - source_branch: "source_branch", target_branch: project.default_branch, + source_branch: "master", target_branch: 'feature', source_project: project, target_project: project, state: "opened") end |