diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-24 08:49:54 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-24 08:49:54 +0000 |
| commit | e97a87433b2f55b2f688771cbe47d627f49d4b44 (patch) | |
| tree | 68b698985cca79d2d9b1351ec186b356e5e3bec2 /doc/workflow | |
| parent | 56d2d462271da802a0126fa588f7ae76ae18f09f (diff) | |
| parent | 13aa6f6740118743e47f24f01aa54fed30079f4d (diff) | |
| download | gitlab-ce-e97a87433b2f55b2f688771cbe47d627f49d4b44.tar.gz | |
Merge branch 'mr-conflict-notification' into 'master'
MR unmergeable notification
See merge request gitlab-org/gitlab-ce!18042
Diffstat (limited to 'doc/workflow')
| -rw-r--r-- | doc/workflow/merge_requests.md | 2 | ||||
| -rw-r--r-- | doc/workflow/notifications.md | 4 | ||||
| -rw-r--r-- | doc/workflow/todos.md | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md index a68bb8b27ca..dc6da1938f3 100644 --- a/doc/workflow/merge_requests.md +++ b/doc/workflow/merge_requests.md @@ -1 +1 @@ -This document was moved to [user/project/merge_requests](../user/project/merge_requests.md). +This document was moved to [user/project/merge_requests/index.md](../user/project/merge_requests/index.md). diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md index f1501c81b27..fc592b99860 100644 --- a/doc/workflow/notifications.md +++ b/doc/workflow/notifications.md @@ -106,6 +106,10 @@ by yourself (except when an issue is due). You will only receive automatic notifications when somebody else comments or adds changes to the ones that you've created or mentions you. +If a merge request becomes unmergeable, its author will be notified about the cause. +If a user has also set the merge request to automatically merge once pipeline succeeds, +then that user will also be notified. + ### Email Headers Notification emails include headers that provide extra content about the notification received: diff --git a/doc/workflow/todos.md b/doc/workflow/todos.md index f13d29884d4..762bf616268 100644 --- a/doc/workflow/todos.md +++ b/doc/workflow/todos.md @@ -31,6 +31,9 @@ A Todo appears in your Todos dashboard when: - you are `@mentioned` in a comment on a commit, - a job in the CI pipeline running for your merge request failed, but this job is not allowed to fail. +- a merge request becomes unmergeable, and you are either: + - the author, or + - have set it to automatically merge once pipeline succeeds. ### Directly addressed Todos |