From 29eea410c440212730a33ddf610483fe095c8670 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 28 Oct 2019 09:06:04 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 doc/api/merge_requests.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'doc')

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
 }
 ```
 
-- 
cgit v1.2.1