diff options
author | karen Carias <karen@gitlab.com> | 2015-08-10 16:14:03 -0700 |
---|---|---|
committer | karen Carias <karen@gitlab.com> | 2015-08-10 16:14:03 -0700 |
commit | e0642b27439f6fffa082885351cf9af6a6220ec3 (patch) | |
tree | 0a22451337de0d122a6beba56ccb8ed6606df2ef /doc | |
parent | 37b4cfea3aa06b9046f8577be5f4cd7bcdf8017a (diff) | |
download | gitlab-ce-e0642b27439f6fffa082885351cf9af6a6220ec3.tar.gz |
fixed conflict
Diffstat (limited to 'doc')
-rw-r--r-- | doc/workflow/notifications.md | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md index 5415fedf29e..80817c98d22 100644 --- a/doc/workflow/notifications.md +++ b/doc/workflow/notifications.md @@ -55,16 +55,7 @@ Below is the table of events users can be notified of: | User added to project | User | Sent when user is added to project | | Project access level changed | User | Sent when user project access level is changed | | User added to group | User | Sent when user is added to group | -| Group access level changed | User | Sent when user group access level is changed | -| Close issue | Issue author [1], issue assignee [2], project members [3] | [1] [2] not disabled, [3] higher than participating | -| Reassign issue | New issue assignee [1], old issue assignee [2] | [1] [2] not disabled | -| Reopen issue | Project members [1] | [1] higher than participating | -| New merge request | MR assignee [1] | [1] not disabled | -| Reassign merge request | New MR assignee [1], old MR assignee [2] | [1] [2] not disabled | -| Close merge request | MR author [1], MR assignee [2], project members [3] | [1] [2] not disabled, [3] higher than participating | -| 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 | +| Group access level changed | User | Sent when user group access level is changed | | Project moved | Project members [1] | [1] not disabled | ### Issue / Merge Request events |