diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-11-07 17:04:35 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-11-07 17:04:35 +0000 |
| commit | 06e8cf58558cccc5a8556e94c93aa4bf25dc083e (patch) | |
| tree | ff70c85f5445127d7a3d2813da3b3ec7904bb3e5 /spec/requests | |
| parent | 98762fe651ea0c4b14106166a742feaba332c128 (diff) | |
| parent | e0054a9ab1dc7f99acff7b4614242a3dbf9328ee (diff) | |
| download | gitlab-ce-06e8cf58558cccc5a8556e94c93aa4bf25dc083e.tar.gz | |
Merge branch 'revert-45b61a9e' into 'master'
Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'"
See merge request gitlab-org/gitlab-ce!22875
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/internal_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index 5ea869796b0..2ebcb787d06 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -683,7 +683,7 @@ describe API::Internal do expect(json_response).to match [{ "branch_name" => "new_branch", - "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new/new_branch", + "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch", "new_merge_request" => true }] end @@ -704,7 +704,7 @@ describe API::Internal do expect(json_response).to match [{ "branch_name" => "new_branch", - "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new/new_branch", + "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch", "new_merge_request" => true }] end @@ -837,7 +837,7 @@ describe API::Internal do expect(json_response['merge_request_urls']).to match [{ "branch_name" => "new_branch", - "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new/new_branch", + "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch", "new_merge_request" => true }] end |