summaryrefslogtreecommitdiff
path: root/doc/development/emails.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-20 12:11:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-20 12:11:29 +0000
commit7b384a1f3d2608898318e67d11eea2914889ae81 (patch)
treeaf33e77d13b18a96156c69616cb09a3a4f7697c6 /doc/development/emails.md
parentd46287cc16ba244720c6d5c00491944336972988 (diff)
downloadgitlab-ce-7b384a1f3d2608898318e67d11eea2914889ae81.tar.gz
Add latest changes from gitlab-org/gitlab@12-3-stable
Diffstat (limited to 'doc/development/emails.md')
-rw-r--r--doc/development/emails.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/development/emails.md b/doc/development/emails.md
index 124d5c16fb8..91b9e11f7f6 100644
--- a/doc/development/emails.md
+++ b/doc/development/emails.md
@@ -88,15 +88,15 @@ for the format of the email key:
- Actions are always at the end, separated by `-`. For example `-issue` or `-merge-request`
- If your feature is related to a project, the key begins with the project identifiers (project path slug
- and project id), separated by `-`. For example, `gitlab-org-gitlab-foss-20`
+ and project id), separated by `-`. For example, `gitlab-org-gitlab-ce-20`
- Additional information, such as an author's token, can be added between the project identifiers and
- the action, separated by `-`. For example, `gitlab-org-gitlab-foss-20-Author_Token12345678-issue`
+ the action, separated by `-`. For example, `gitlab-org-gitlab-ce-20-Author_Token12345678-issue`
- You register your handlers in `lib/gitlab/email/handler.rb`
Examples of valid email keys:
-- `gitlab-org-gitlab-foss-20-Author_Token12345678-issue` (create a new issue)
-- `gitlab-org-gitlab-foss-20-Author_Token12345678-merge-request` (create a new merge request)
+- `gitlab-org-gitlab-ce-20-Author_Token12345678-issue` (create a new issue)
+- `gitlab-org-gitlab-ce-20-Author_Token12345678-merge-request` (create a new merge request)
- `1234567890abcdef1234567890abcdef-unsubscribe` (unsubscribe from a conversation)
- `1234567890abcdef1234567890abcdef` (reply to a conversation)