diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2018-12-05 13:07:36 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-12-05 13:07:36 +0300 |
commit | 00ff9c2f9eee8dffd2329b9a4df98504704e32bd (patch) | |
tree | 59d47bfbf08691e152036556363c78ee390e6592 /doc | |
parent | 14db2a42149cc1680762cf6df443677d76dca9ee (diff) | |
parent | b3ff54e4d5c42d217b8d39b1f95fe8c160188371 (diff) |
Merge branch 'jramsay/email-push-docs' into 'master'
Add example email on push notification to docs
See merge request gitlab-org/gitlab-ce!23566
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/project/integrations/emails_on_push.md | 16 | ||||
-rw-r--r-- | doc/user/project/integrations/img/emails_on_push_email.png | bin | 0 -> 62816 bytes | |||
-rw-r--r-- | doc/user/project/integrations/img/emails_on_push_service.png | bin | 28535 -> 26788 bytes |
3 files changed, 8 insertions, 8 deletions
diff --git a/doc/user/project/integrations/emails_on_push.md b/doc/user/project/integrations/emails_on_push.md index b050c83fb72..df320de7e16 100644 --- a/doc/user/project/integrations/emails_on_push.md +++ b/doc/user/project/integrations/emails_on_push.md @@ -1,20 +1,20 @@ # Enabling emails on push -By enabling this service, you will be able to receive email notifications for -every change that is pushed to your project. +By enabling this service, you will receive email notifications for every change +that is pushed to your project. -Navigate to the [Integrations page](project_services.md#accessing-the-project-services) -and select the **Emails on push** service to configure it. +From the [Integrations page](project_services.md#accessing-the-project-services) +select **Emails on push** service to activate and configure it. In the _Recipients_ area, provide a list of emails separated by spaces or newlines. -You can configure any of the following settings depending on your preference. +The following options are available: + **Push events** - Email will be triggered when a push event is received + **Tag push events** - Email will be triggered when a tag is created and pushed + **Send from committer** - Send notifications from the committer's email address if the domain is part of the domain GitLab is running on (e.g. `user@gitlab.com`). + **Disable code diffs** - Don't include possibly sensitive code diffs in notification body. ---- - -![Email on push service settings](img/emails_on_push_service.png) +| Settings | Notification | +| --- | --- | +| ![Email on push service settings](img/emails_on_push_service.png) | ![Email on push notification](img/emails_on_push_email.png) | diff --git a/doc/user/project/integrations/img/emails_on_push_email.png b/doc/user/project/integrations/img/emails_on_push_email.png Binary files differnew file mode 100644 index 00000000000..406eeb18410 --- /dev/null +++ b/doc/user/project/integrations/img/emails_on_push_email.png diff --git a/doc/user/project/integrations/img/emails_on_push_service.png b/doc/user/project/integrations/img/emails_on_push_service.png Binary files differindex df301aa1eeb..84e42eca9a2 100644 --- a/doc/user/project/integrations/img/emails_on_push_service.png +++ b/doc/user/project/integrations/img/emails_on_push_service.png |