diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-03-07 11:27:52 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-03-07 11:27:52 +0000 |
| commit | c45bb62c0ae36018891a343c7c820fc1a901e33e (patch) | |
| tree | f5a9cb739ab4ed509d66947bbf9581906310e271 /spec/requests/api/merge_requests_spec.rb | |
| parent | e571cbaa2f0b5096e514bc96fbc8f26909d8e52b (diff) | |
| parent | 2cb45dd0d56156ace389239088822c428d87585c (diff) | |
| download | gitlab-ce-c45bb62c0ae36018891a343c7c820fc1a901e33e.tar.gz | |
Merge branch 'osw-merge-to-ref-changes-for-ci-team' into 'master'
Make merge to refs/merge-requests/:iid/merge not raise when FF-only enabled
Closes #58393
See merge request gitlab-org/gitlab-ce!25653
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
| -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 6752a1c36bf..fee6312a9c7 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -1132,18 +1132,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 |