summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-04-12 13:48:38 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-04-17 13:21:56 +0100
commita78d7f3ee6b858b60784ad7b57bc691f3302de34 (patch)
tree4d038f590226c71cf21f00e6f6076a8d4b91169d
parent488204436d65153e26385c878f006fe4ea39d0d9 (diff)
downloadgitlab-ce-a78d7f3ee6b858b60784ad7b57bc691f3302de34.tar.gz
Merge branch '5103-mention-reply-by-email-in-user-docs' into 'master'
Mention reply-by-email in user doc Closes gitlab-ee#5103 See merge request gitlab-org/gitlab-ce!18310
-rw-r--r--doc/user/discussions/index.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index eacfe2baa27..159109e8954 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -14,6 +14,10 @@ The comment area supports [Markdown] and [quick actions]. One can edit their
own comment at any time, and anyone with [Master 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,
+provided that [Reply by email] is configured by your GitLab admin. This also
+supports [Markdown] and [quick actions] as if replied from the web.
+
Apart from the standard comments, you also have the option to create a comment
in the form of a resolvable or threaded discussion.
@@ -283,3 +287,4 @@ edit existing comments. Non-team members are restricted from adding or editing c
[markdown]: ../markdown.md
[quick actions]: ../project/quick_actions.md
[permissions]: ../permissions.md
+[Reply by email]: ../../administration/reply_by_email.md