From 29eea410c440212730a33ddf610483fe095c8670 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 28 Oct 2019 09:06:04 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/requests/api/merge_requests_spec.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'spec/requests/api/merge_requests_spec.rb') 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 -- cgit v1.2.3