From e0054a9ab1dc7f99acff7b4614242a3dbf9328ee Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 7 Nov 2018 13:32:20 +0000 Subject: Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'" This reverts merge request !22526 --- spec/controllers/projects/blob_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/controllers/projects/blob_controller_spec.rb') 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" } ) -- cgit v1.2.1