Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-21 21:10:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-21 21:10:26 +0300
commit152f35d6bfa9178587da609d80944d4ec765219b (patch)
treed8b21a0ed11f1630b483b22610ca57dbac48a42b /doc/api/discussions.md
parentcb3b8bd5897cb77b5a00278ab86db89c7ffa2efa (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/discussions.md')
-rw-r--r--doc/api/discussions.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/api/discussions.md b/doc/api/discussions.md
index 51ca2bea3ae..a7a53987fe9 100644
--- a/doc/api/discussions.md
+++ b/doc/api/discussions.md
@@ -687,7 +687,8 @@ GET /projects/:id/merge_requests/:merge_request_iid/discussions
"noteable_iid": null,
"resolved": false,
"resolvable": true,
- "resolved_by": null
+ "resolved_by": null,
+ "resolved_at": null
},
{
"id": 1129,