diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-07 13:32:20 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-07 13:32:20 +0000 |
| commit | e0054a9ab1dc7f99acff7b4614242a3dbf9328ee (patch) | |
| tree | f1a362a4312fb5937b7fd1b74e3f6065189496af /spec/controllers/projects/blob_controller_spec.rb | |
| parent | 0cd22a382ef390cda6dab001ab5e4738dd25b3a5 (diff) | |
| download | gitlab-ce-e0054a9ab1dc7f99acff7b4614242a3dbf9328ee.tar.gz | |
Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'"
This reverts merge request !22526
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 f58aa25cbdd..5fdf7f1229d 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" } ) |