diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-09 16:01:20 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-09 16:01:20 +0000 |
| commit | 6b0801d4f3bcdce5c7aaeb31227782293abbfa68 (patch) | |
| tree | 682d9c516915226d81022d8aedaa28d2f8a778f7 /spec | |
| parent | f86ff1b833eb04dfc66638bdff110fa7cb9b2360 (diff) | |
| parent | f6a666bdc2b9b557247c34935b69f35fb518e348 (diff) | |
| download | gitlab-ce-6b0801d4f3bcdce5c7aaeb31227782293abbfa68.tar.gz | |
Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master'
Expose MergeRequest#merge_status
_Originally opened at !2478 by @develop7._
- - -
This enables API users to see whether a merge request can be merged without conflicts.
See merge request !2756
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index d7bfa17b0b1..a91a8696831 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -115,6 +115,7 @@ describe API::API, api: true do expect(response.status).to eq(200) expect(json_response['title']).to eq(merge_request.title) expect(json_response['iid']).to eq(merge_request.iid) + expect(json_response['merge_status']).to eq('can_be_merged') end it 'should return merge_request by iid' do |