kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Rephrase resolvable comments section

Browse source
This commit is contained in:
Mike Lewis 2019-03-07 15:31:55 +00:00
parent 290c25dff1
commit 8e4948ffe9
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/user/discussions/index.md
View file

@ -11,7 +11,7 @@ You can leave a comment in the following places:
- commit diffs - commit diffs
There are standard comments, and you also have the option to create a comment There are standard comments, and you also have the option to create a comment
in the form of a resolvable/threaded discussion. A comment can also be [turned into a discussion](#start-a-discussion-by-replying-to-a-non-discussion-comment) in the form of a threaded discussion. A comment can also be [turned into a discussion](#start-a-discussion-by-replying-to-a-non-discussion-comment)
when it receives a reply. when it receives a reply.
The comment area supports [Markdown] and [quick actions]. You can edit your own The comment area supports [Markdown] and [quick actions]. You can edit your own
@ -23,21 +23,23 @@ provided that [Reply by email] is configured by your GitLab admin. This also
supports [Markdown] and [quick actions] as if replied from the web. Note that this supports [Markdown] and [quick actions] as if replied from the web. Note that this
adds an additional comment, but does not create a discussion. adds an additional comment, but does not create a discussion.
## Resolvable discussions ## Resolvable comments and discussions
> **Notes:** > **Notes:**
> - The main feature was [introduced][ce-5022] in GitLab 8.11. > - The main feature was [introduced][ce-5022] in GitLab 8.11.
> - Resolvable discussions can be added only to merge request diffs. > - Resolvable discussions can be added only to merge request diffs.
Discussion resolution helps keep track of progress during planning or code review. Discussion resolution helps keep track of progress during planning or code review.
Resolving comments prevents you from forgetting to address feedback and lets you
hide discussions that are no longer relevant. Every standard comment or discussion thread in merge requests, commits, commit diffs, and
snippets is initially displayed as unresolved. They can then be individually resolved by anyone
with at least Developer access to the project or by the author of the change being reviewed.
The need to resolve all standard comments or discussions prevents you from forgetting
to address feedback and lets you hide discussions that are no longer relevant.
!["A discussion between two people on a piece of code"][discussion-view] !["A discussion between two people on a piece of code"][discussion-view]
Comments and discussions can be resolved by anyone with at least Developer
access to the project or the author of the merge request.
### Commit discussions in the context of a merge request ### Commit discussions in the context of a merge request
> [Introduced][ce-31847] in GitLab 10.3. > [Introduced][ce-31847] in GitLab 10.3.