summaryrefslogtreecommitdiff
path: root/doc/administration/incoming_email.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-21 06:08:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-21 06:08:58 +0000
commit18b8435318887d3fc6e9f9d305967a953cdd7d3f (patch)
tree28cb71f255eb364c224ff24dd085f8cd836951b1 /doc/administration/incoming_email.md
parent4359b9650ecf0960f04f0fd38fc25bec7b478a11 (diff)
downloadgitlab-ce-18b8435318887d3fc6e9f9d305967a953cdd7d3f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/incoming_email.md')
-rw-r--r--doc/administration/incoming_email.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/incoming_email.md b/doc/administration/incoming_email.md
index 07b6f79a0fa..6a0249d85d8 100644
--- a/doc/administration/incoming_email.md
+++ b/doc/administration/incoming_email.md
@@ -81,7 +81,7 @@ incoming email domain to `hooli.com`, an attacker could abuse the "Create new
issue by email" or
"[Create new merge request by email](../user/project/merge_requests/creating_merge_requests.md#new-merge-request-by-email-core-only)"
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
+Slack. This 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.