diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 09:08:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 09:08:42 +0000 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /doc/development/emails.md | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
download | gitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'doc/development/emails.md')
-rw-r--r-- | doc/development/emails.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/emails.md b/doc/development/emails.md index c1054077f9e..f99b914e2de 100644 --- a/doc/development/emails.md +++ b/doc/development/emails.md @@ -26,7 +26,7 @@ mailer.unknown_sign_in_email(user, ip, time).deliver_later To view rendered emails "sent" in your development instance, visit [`/rails/letter_opener`](http://localhost:3000/rails/letter_opener). -Please note that [S/MIME signed](../administration/smime_signing_email.md) emails +[S/MIME signed](../administration/smime_signing_email.md) emails [cannot be currently previewed](https://github.com/fgrehm/letter_opener_web/issues/96) with `letter_opener`. @@ -125,7 +125,7 @@ Examples of valid email keys: - `1234567890abcdef1234567890abcdef-unsubscribe` (unsubscribe from a conversation) - `1234567890abcdef1234567890abcdef` (reply to a conversation) -Please note that the action `-issue-` is used in GitLab as the handler for the Service Desk feature. +The action `-issue-` is used in GitLab as the handler for the Service Desk feature. ### Legacy format @@ -137,7 +137,7 @@ These are the only valid legacy formats for an email handler: - `namespace` - `namespace+action` -Please note that `path/to/project` is used in GitLab as the handler for the Service Desk feature. +In GitLab, the handler for the Service Desk feature is `path/to/project`. --- |