diff options
Diffstat (limited to 'doc/api/merge_requests.md')
| -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 } ``` |