diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-03-07 12:34:05 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-03-07 12:34:05 +0000 |
| commit | 41c6252111ef21daef2515119ed7791e43d64f49 (patch) | |
| tree | f6b9edcfb34f8bd451afe7d6a87649ea9de7dc26 /doc/user | |
| parent | e382611d3b5ea2f8c2bd6b6aa54b0f69702bff21 (diff) | |
| parent | 66f25ea6c44fb1d73e437a2d33ef1a926d778c11 (diff) | |
| download | gitlab-ce-41c6252111ef21daef2515119ed7791e43d64f49.tar.gz | |
Merge branch 'winh-enable-reply_to_individual_notes' into 'master'
Enable reply_to_individual_notes feature flag by default
Closes #30299
See merge request gitlab-org/gitlab-ce!25575
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/discussions/img/reply_to_comment.gif | bin | 0 -> 508115 bytes | |||
| -rw-r--r-- | doc/user/discussions/img/reply_to_comment_button.png | bin | 0 -> 17224 bytes | |||
| -rw-r--r-- | doc/user/discussions/index.md | 25 |
3 files changed, 23 insertions, 2 deletions
diff --git a/doc/user/discussions/img/reply_to_comment.gif b/doc/user/discussions/img/reply_to_comment.gif Binary files differnew file mode 100644 index 00000000000..c62f7fdb5fe --- /dev/null +++ b/doc/user/discussions/img/reply_to_comment.gif diff --git a/doc/user/discussions/img/reply_to_comment_button.png b/doc/user/discussions/img/reply_to_comment_button.png Binary files differnew file mode 100644 index 00000000000..d362b19785c --- /dev/null +++ b/doc/user/discussions/img/reply_to_comment_button.png diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index 1e2fad1efe9..02bfd2bec7a 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -10,8 +10,9 @@ You can leave a comment in the following places: - commits - commit diffs -The comment area supports [Markdown] and [quick actions]. One can edit their -own comment at any time, and anyone with [Maintainer access level][permissions] or +The comment area supports [Markdown] and [quick actions]. Every individual +comment can be [turned into a discussion](#start-a-discussion-by-replying-to-a-non-discussion-comment) +One can also edit their own comment at any time, and anyone with [Maintainer access level][permissions] or higher can also edit a comment made by someone else. You could also reply to the notification email in order to reply to a comment, @@ -339,6 +340,26 @@ and push the suggested change directly into the codebase in the merge request's Custom commit messages will be introduced by [#54404](https://gitlab.com/gitlab-org/gitlab-ce/issues/54404). +## Start a discussion by replying to a non-discussion comment + +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/30299) in GitLab 11.9 + +To reply a non-discussion comment, you can use the **Reply to comment** button. + + + +The **Reply to comment** button is only displayed if you have permissions to reply to an existing discussion, or start a discussion from a standalone comment. + +Clicking on the **Reply to comment** button will bring the reply area into focus and you can type your reply. + + + +Relying to a non-discussion comment will convert the non-discussion comment to a +threaded discussion once the reply is submitted. This conversion is considered an edit +to the original comment, so a note about when it was last edited will appear underneath it. + +This feature only exists for Issues, Merge requests, and Epics. Commits, Snippets and Merge request diff discussions are not supported yet. + [ce-5022]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022 [ce-7125]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7125 [ce-7527]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7527 |
