summaryrefslogtreecommitdiff
path: root/doc/administration
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-12-14 14:51:56 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2017-12-14 14:51:56 +0000
commit391bb437611b91e2767384ff9852beb573c84996 (patch)
treeceb1916c2e75d9f39251ee79d17cf192e79fe105 /doc/administration
parentf51141878171c1162818f8fa0133125a5e92d3eb (diff)
parente297c4175df7a3af12dfff5bb9947560ce8add17 (diff)
downloadgitlab-ce-391bb437611b91e2767384ff9852beb573c84996.tar.gz
Merge branch 'docs-jprovazn-create-from-email' into 'master'
Fixed doc for create MR from email See merge request gitlab-org/gitlab-ce!15849
Diffstat (limited to 'doc/administration')
-rw-r--r--doc/administration/reply_by_email.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/administration/reply_by_email.md b/doc/administration/reply_by_email.md
index 1304476e678..3a2cced37bf 100644
--- a/doc/administration/reply_by_email.md
+++ b/doc/administration/reply_by_email.md
@@ -89,9 +89,11 @@ email address in order to sign up.
If you also host a public-facing GitLab instance at `hooli.com` and set your
incoming email domain to `hooli.com`, an attacker could abuse the "Create new
-issue by email" feature by using a project's unique address as the email when
-signing up for Slack, which would send a confirmation email, which would create
-a new issue on the project owned by the attacker, allowing them to click the
+issue by email" or
+"[Create new merge request by email](../user/project/merge_requests/index.md#create-new-merge-requests-by-email)"
+features by using a project's unique address as the email when signing up for
+Slack, which would send a confirmation email, which would create a new issue or
+merge request on the project owned by the attacker, allowing them to click the
confirmation link and validate their account on your company's private Slack
instance.