diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-07-23 13:40:31 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-07-23 13:40:31 +0200 |
| commit | f032b15dcfabe6cad8eafb61fac115b9b012cb5d (patch) | |
| tree | 5a5f6b2bcd05c197ce66ee1b1480a4c64f350e8e /doc/workflow | |
| parent | d01153c45e98602b971260cbd3176b016d25c75d (diff) | |
| parent | 5dd4dea93baa6386ed860a50125dce3ca3890f16 (diff) | |
| download | gitlab-ce-f032b15dcfabe6cad8eafb61fac115b9b012cb5d.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee
# Conflicts:
# README.md
# app/controllers/projects_controller.rb
# db/schema.rb
# doc/workflow/README.md
# lib/gitlab/satellite/merge_action.rb
Diffstat (limited to 'doc/workflow')
| -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 e45697a617c..a61d38d3fee 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -10,7 +10,7 @@ - [Labels](labels.md) - [Manage large binaries with git annex](git_annex.md) - [Merge Request Approvals](merge_request_approvals.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 | - - |