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

Merge branch 'grapify-merge-request-api' into 'master'
68978697 · Rémy Coutable · b3616e30 · 9dbb0417 · 68978697 · 68978697
Commit 68978697 authored Nov 15, 2016 by Rémy Coutable
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

merge_requests.rb lib/api/merge_requests.rb +0 -0

merge_requests_spec.rb spec/requests/api/merge_requests_spec.rb +0 -6

No files found.
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -494,12 +494,6 @@ describe API::API, api: true  do
      expect(json_response['milestone']['id']).to eq(milestone.id)
    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
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), target_branch: "wiki"
      expect(response).to have_http_status(200)