diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 12:06:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 12:06:04 +0300 |
| commit | 29eea410c440212730a33ddf610483fe095c8670 (patch) | |
| tree | b3071ada8f9524f99bf8479006553b8146365792 /spec/requests/api/merge_requests_spec.rb | |
| parent | 1a3d7b9fcda9e4eecd22b84f4254efc07344b284 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 721998ede6a..443682cd34c 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -775,6 +775,8 @@ describe API::MergeRequests do expect(json_response['merge_error']).to eq(merge_request.merge_error) expect(json_response['user']['can_merge']).to be_truthy expect(json_response).not_to include('rebase_in_progress') + expect(json_response['has_conflicts']).to be_falsy + expect(json_response['blocking_discussions_resolved']).to be_truthy end it 'exposes description and title html when render_html is true' do |