Commit 68978697 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'grapify-merge-request-api' into 'master'

Grapify the merge request API

Grapfiy the merge request API. I removed the test for checking if the source branch can be changed since this is an unused parameter. IMHO the test does not make sense.

## What are the relevant issue numbers?

Related to #22928

See merge request !7358
parents b3616e30 9dbb0417
This diff is collapsed.
...@@ -494,12 +494,6 @@ describe API::API, api: true do ...@@ -494,12 +494,6 @@ describe API::API, api: true do
expect(json_response['milestone']['id']).to eq(milestone.id) expect(json_response['milestone']['id']).to eq(milestone.id)
end end
it "returns 400 when source_branch is specified" do
put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user),
source_branch: "master", target_branch: "master"
expect(response).to have_http_status(400)
end
it "returns merge_request with renamed target_branch" do it "returns merge_request with renamed target_branch" do
put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), target_branch: "wiki" put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), target_branch: "wiki"
expect(response).to have_http_status(200) expect(response).to have_http_status(200)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment