Commit 12bcafff authored by Marcin Sedlak-Jakubowski's avatar Marcin Sedlak-Jakubowski

Merge branch 'gottesman.rachelg-master-patch-32010' into 'master'

Fix future tense issues

See merge request gitlab-org/gitlab!49026
parents 83b25c71 c23cee34
...@@ -15,34 +15,40 @@ replying to notification emails. ...@@ -15,34 +15,40 @@ replying to notification emails.
Make sure [incoming email](incoming_email.md) is set up. Make sure [incoming email](incoming_email.md) is set up.
## How it works? ## How it works
### 1. GitLab sends a notification email Replying by email happens in three steps:
1. GitLab sends a notification email.
1. You reply to the notification email.
1. GitLab receives your reply to the notification email.
### GitLab sends a notification email
When GitLab sends a notification and Reply by email is enabled, the `Reply-To` When GitLab sends a notification and Reply by email is enabled, the `Reply-To`
header is set to the address defined in your GitLab configuration, with the header is set to the address defined in your GitLab configuration, with the
`%{key}` placeholder (if present) replaced by a specific "reply key". In `%{key}` placeholder (if present) replaced by a specific "reply key". In
addition, this "reply key" is also added to the `References` header. addition, this "reply key" is also added to the `References` header.
### 2. You reply to the notification email ### You reply to the notification email
When you reply to the notification email, your email client will: When you reply to the notification email, your email client:
- send the email to the `Reply-To` address it got from the notification email - sends the email to the `Reply-To` address it got from the notification email
- set the `In-Reply-To` header to the value of the `Message-ID` header from the - sets the `In-Reply-To` header to the value of the `Message-ID` header from the
notification email notification email
- set the `References` header to the value of the `Message-ID` plus the value of - sets the `References` header to the value of the `Message-ID` plus the value of
the notification email's `References` header. the notification email's `References` header.
### 3. GitLab receives your reply to the notification email ### GitLab receives your reply to the notification email
When GitLab receives your reply, it will look for the "reply key" in the When GitLab receives your reply, it looks for the "reply key" in the
following headers, in this order: following headers, in this order:
1. the `To` header 1. the `To` header
1. the `References` header 1. the `References` header
If it finds a reply key, it will be able to leave your reply as a comment on If it finds a reply key, it leaves your reply as a comment on
the entity the notification was about (issue, merge request, commit...). the entity the notification was about (issue, merge request, commit...).
For more details about the `Message-ID`, `In-Reply-To`, and `References headers`, For more details about the `Message-ID`, `In-Reply-To`, and `References headers`,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment