diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-03-01 15:20:11 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-03-06 23:49:31 +0300 |
| commit | 2cb45dd0d56156ace389239088822c428d87585c (patch) | |
| tree | b4ec8b3839e8311396792c8037e47cba0cb0b5c7 /spec/requests | |
| parent | 959ad992b6b95458f084569ec6d71c8608c3e3c7 (diff) | |
Provide reliable source and target IDs
Returns the source and target IDs used to create
the merge commit on Gitaly.
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 6272bb38d59..05b904ab59c 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -1060,18 +1060,6 @@ describe API::MergeRequests do expect(response).to have_gitlab_http_status(404) end - - it "returns 400 when merge method is not supported" do - merge_request.project.update!(merge_method: 'ff') - - put api(url, user) - - expected_error = - 'Fast-forward to refs/merge-requests/1/merge is currently not supported.' - - expect(response).to have_gitlab_http_status(400) - expect(json_response['message']).to eq(expected_error) - end end describe "PUT /projects/:id/merge_requests/:merge_request_iid" do |