diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-06-25 15:20:29 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-25 15:20:29 +0000 |
| commit | ea25fbb8f594fb615571056c38d38a2a759c4e7b (patch) | |
| tree | d785c7197ab1881b325f3194bf9101de9bded37b /doc/workflow | |
| parent | 6938335c6585868c32143c82bd8a0b7a710d1ba9 (diff) | |
| download | gitlab-ce-ea25fbb8f594fb615571056c38d38a2a759c4e7b.tar.gz | |
Notify conflict only for opened/locked merge requests
Diffstat (limited to 'doc/workflow')
| -rw-r--r-- | doc/workflow/notifications.md | 2 | ||||
| -rw-r--r-- | doc/workflow/todos.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md index edb0c6bdc30..5dc62a30128 100644 --- a/doc/workflow/notifications.md +++ b/doc/workflow/notifications.md @@ -111,7 +111,7 @@ 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 an open merge request becomes unmergeable due to conflict, 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. diff --git a/doc/workflow/todos.md b/doc/workflow/todos.md index 762bf616268..760cd87d4cc 100644 --- a/doc/workflow/todos.md +++ b/doc/workflow/todos.md @@ -31,7 +31,7 @@ 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: +- an open merge request becomes unmergeable due to conflict, and you are either: - the author, or - have set it to automatically merge once pipeline succeeds. |