diff options
Diffstat (limited to 'doc/development/emails.md')
| -rw-r--r-- | doc/development/emails.md | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/development/emails.md b/doc/development/emails.md index a84895eef5b..e6e2ea8aae7 100644 --- a/doc/development/emails.md +++ b/doc/development/emails.md @@ -14,13 +14,11 @@ Please note that [S/MIME signed](../administration/smime_signing_email.md) email Rails provides a way to preview our mailer templates in HTML and plaintext using dummy data. -The previews live in [`app/mailers/previews`][previews] and can be viewed at +The previews live in [`app/mailers/previews`](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/app/mailers/previews) and can be viewed at [`/rails/mailers`](http://localhost:3000/rails/mailers). See the [Rails guides](https://guides.rubyonrails.org/action_mailer_basics.html#previewing-emails) for more information. -[previews]: https://gitlab.com/gitlab-org/gitlab-foss/tree/master/app/mailers/previews - ## Incoming email 1. Go to the GitLab installation directory. @@ -59,6 +57,9 @@ See the [Rails guides](https://guides.rubyonrails.org/action_mailer_basics.html# mailbox: "inbox" # The IDLE command timeout. idle_timeout: 60 + + # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery + expunge_deleted: false ``` As mentioned, the part after `+` is ignored, and this will end up in the mailbox for `gitlab-incoming@gmail.com`. @@ -87,7 +88,7 @@ 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-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` - You register your handlers in `lib/gitlab/email/handler.rb` |