diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 09:06:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 09:06:04 +0000 |
| commit | 29eea410c440212730a33ddf610483fe095c8670 (patch) | |
| tree | b3071ada8f9524f99bf8479006553b8146365792 /doc/api | |
| parent | 1a3d7b9fcda9e4eecd22b84f4254efc07344b284 (diff) | |
| download | gitlab-ce-29eea410c440212730a33ddf610483fe095c8670.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/merge_requests.md | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 4bc46c3030d..ef5cbeb015e 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -304,7 +304,9 @@ Parameters: "task_completion_status":{ "count":0, "completed_count":0 - } + }, + "has_conflicts": false, + "blocking_discussions_resolved": true } ] ``` @@ -453,7 +455,9 @@ Parameters: "task_completion_status":{ "count":0, "completed_count":0 - } + }, + "has_conflicts": false, + "blocking_discussions_resolved": true } ] ``` @@ -606,7 +610,9 @@ Parameters: "task_completion_status":{ "count":0, "completed_count":0 - } + }, + "has_conflicts": false, + "blocking_discussions_resolved": true } ``` |