summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-01-07 08:23:43 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-01-07 08:23:43 +0000
commitdb0b2381fefecfe3b67fe23bd7e97f522148a3d2 (patch)
tree871d12e65f8368be7cb7bb72936e40a7a2b404c6
parent052b5a889901dc3a4ad426eabc89310a14f71954 (diff)
parentda645b61ae8c683f71e7ea4082577b16c1ea44f9 (diff)
downloadgitlab-ce-db0b2381fefecfe3b67fe23bd7e97f522148a3d2.tar.gz
Merge branch '29951-add-question-mark' into 'master'
Add help icon next to private email Closes #29951 See merge request gitlab-org/gitlab-ce!24179
-rw-r--r--app/views/projects/_issuable_by_email.html.haml7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/_issuable_by_email.html.haml b/app/views/projects/_issuable_by_email.html.haml
index d59191a6f87..c8ad5919596 100644
--- a/app/views/projects/_issuable_by_email.html.haml
+++ b/app/views/projects/_issuable_by_email.html.haml
@@ -36,7 +36,12 @@
%p
= render 'by_email_description'
%p
- This is a private email address, generated just for you.
+ This is a private email address
+
+ %a{ href: 'https://docs.gitlab.com/ee/development/emails.html#email-namespace', target: "_blank", rel: "noopener" }
+ %i.fa.fa-question-circle{ 'aria-label': "Learn more about incoming email addresses" }
+
+ , generated just for you.
Anyone who gets ahold of it can create issues or merge requests as if they were you.
You should