diff options
| author | Constance Okoghenun <constanceokoghenun@gmail.com> | 2018-11-05 10:33:05 +0100 |
|---|---|---|
| committer | Constance Okoghenun <constanceokoghenun@gmail.com> | 2018-11-05 10:33:05 +0100 |
| commit | 3bac1a322c82dd9b6e9b23edd66fa45afaa9859f (patch) | |
| tree | d3e7d47a3e0c8047cb2972aefbc12fe1e3080ef8 /spec/controllers/projects/blob_controller_spec.rb | |
| parent | fe7b6f57120946a5d5fe4a4d54a245dc76b06dc8 (diff) | |
| parent | 9e2eb85e365e2a33e52e3f1f48cc23ad4201a52b (diff) | |
| download | gitlab-ce-issue_51323.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_51323issue_51323
Diffstat (limited to 'spec/controllers/projects/blob_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/blob_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb index 28f7e4634a5..64b589a6d83 100644 --- a/spec/controllers/projects/blob_controller_spec.rb +++ b/spec/controllers/projects/blob_controller_spec.rb @@ -331,10 +331,10 @@ describe Projects::BlobController do expect(response).to redirect_to( project_new_merge_request_path( forked_project, + merge_request_source_branch: "fork-test-1", merge_request: { source_project_id: forked_project.id, target_project_id: project.id, - source_branch: "fork-test-1", target_branch: "master" } ) |