Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-12 06:08:55 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-12 06:08:55 +0300
commit500626a5c953ad81cfc3ed74bf0148c075617e58 (patch)
tree554e385e0e548f15fc90388da8b73622b803d6f3 /doc/development/emails.md
parentb133cb2468b412683dbc5f19492d98b2ffa47d09 (diff)
Add latest changes from gitlab-org/gitlab@master
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 5617d9d43f2..133434523ec 100644
--- a/doc/development/emails.md
+++ b/doc/development/emails.md
@@ -79,17 +79,17 @@ See the [Rails guides](https://guides.rubyonrails.org/action_mailer_basics.html#
## Email namespace
-As of GitLab 11.7, we support a new format for email handler addresses. This was done to
+As of GitLab 11.7, we support a new format for email handler addresses. This was done to
support catch-all mailboxes.
If you need to implement a feature which requires a new email handler, follow these rules
for the format of the email key:
-- Actions are always at the end, separated by `-`. For example `-issue` or `-merge-request`
+- 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-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-foss-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: