diff options
| author | Job van der Voort <job@gitlab.com> | 2015-07-14 15:24:34 +0000 |
|---|---|---|
| committer | Job van der Voort <job@gitlab.com> | 2015-07-14 15:24:34 +0000 |
| commit | 1da6d42bca549265112aee4375b35181d39952f9 (patch) | |
| tree | f59a9f74c23b51094e39f962f4f01057a42ce8c7 | |
| parent | 070d6a2452c7fe358ab828b5516e421a363770e0 (diff) | |
| parent | 3d6e67e44ed65eafbf81de3abb6b3c69b2500079 (diff) | |
| download | gitlab-ce-1da6d42bca549265112aee4375b35181d39952f9.tar.gz | |
Merge branch 'notifications-title' into 'master'
fixed notifications title
I fixed the title and link to this document because I believe that it's more clear and easier to find if it has "emails" in the name.
See merge request !1897
| -rw-r--r-- | doc/workflow/README.md | 2 | ||||
| -rw-r--r-- | doc/workflow/notifications.md | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/workflow/README.md b/doc/workflow/README.md index f1959d30139..1f39d02bdf3 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -7,7 +7,7 @@ - [Groups](groups.md) - [Keyboard shortcuts](shortcuts.md) - [Labels](labels.md) -- [Notifications](notifications.md) +- [Notification emails](notifications.md) - [Project Features](project_features.md) - [Project forking workflow](forking_workflow.md) - [Protected branches](protected_branches.md) diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md index 17215de677e..2b5f06dd1fa 100644 --- a/doc/workflow/notifications.md +++ b/doc/workflow/notifications.md @@ -1,6 +1,6 @@ -# GitLab Notifications +# GitLab Notification Emails -GitLab has notifications system in place to notify a user of events important for the workflow. +GitLab has a notification system in place to notify a user of events that are important for the workflow. ## Notification settings @@ -67,5 +67,3 @@ Below is the table of events users can be notified of: | Reopen merge request | Project members [1] | [1] higher than participating | | Merge merge request | MR author [1], MR assignee [2], project members [3] | [1] [2] not disabled, [3] higher than participating | | New comment | Mentioned users [1], users participating [2], project members [3] | [1] [2] not disabled, [3] higher than participating | - - |