diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 18:06:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 18:06:14 +0000 |
commit | b08279013423a66f06f5edde4e067f328fe135bd (patch) | |
tree | 47aca1a9b0655cd7861bddf31ec17d4b302fc4ea /doc/development/emails.md | |
parent | 4584eb0e07d372d6014de16ab359965475184c99 (diff) | |
download | gitlab-ce-b08279013423a66f06f5edde4e067f328fe135bd.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/emails.md')
-rw-r--r-- | doc/development/emails.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/development/emails.md b/doc/development/emails.md index 91b9e11f7f6..124d5c16fb8 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-ce-20` + and project id), separated by `-`. For example, `gitlab-org-gitlab-foss-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-ce-20-Author_Token12345678-issue` + the action, separated by `-`. For example, `gitlab-org-gitlab-foss-20-Author_Token12345678-issue` - You register your handlers in `lib/gitlab/email/handler.rb` Examples of valid email keys: -- `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) +- `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) - `1234567890abcdef1234567890abcdef-unsubscribe` (unsubscribe from a conversation) - `1234567890abcdef1234567890abcdef` (reply to a conversation) |