summaryrefslogtreecommitdiff
path: root/doc/user/discussions
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-16 18:25:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-16 18:25:58 +0000
commita5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch)
treefb69158581673816a8cd895f9d352dcb3c678b1e /doc/user/discussions
parentd16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff)
downloadgitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'doc/user/discussions')
-rw-r--r--doc/user/discussions/index.md9
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index 50007545a65..cf57afb8324 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -7,7 +7,8 @@ type: reference, howto
# Threads **(FREE)**
-GitLab encourages communication through comments, threads, and suggestions.
+GitLab encourages communication through comments, threads, and
+[code suggestions](../project/merge_requests/reviews/suggestions.md).
For example, you can create a comment in the following places:
@@ -22,8 +23,10 @@ There are standard comments, and you also have the option to create a comment
in the form of a thread. A comment can also be [turned into a thread](#start-a-thread-by-replying-to-a-standard-comment)
when it receives a reply.
-The comment area supports [Markdown](../markdown.md) and [quick actions](../project/quick_actions.md). You can edit your own
-comment at any time, and anyone with [Maintainer access level](../permissions.md) or
+The comment area supports [Markdown](../markdown.md) and [quick actions](../project/quick_actions.md).
+You can [suggest code changes](../project/merge_requests/reviews/suggestions.md) in your comment,
+which the user can accept through the user interface. You can edit your own
+comment at any time, and anyone with the [Maintainer role](../permissions.md) or
higher can also edit a comment made by someone else.
You can also reply to a comment notification email to reply to the comment if