diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-06-25 09:38:13 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-25 09:38:13 +0800 |
| commit | 37a8338bdf7e543865f8dc1e716929cca4cb12cd (patch) | |
| tree | d5407574fe8d987f2d3cd5bf1a4fcac1e93544f4 | |
| parent | 2fbd14322fb663fd88b7a6e96edcf51e2aeee276 (diff) | |
| download | gitlab-ce-6598-notify-only-open-unmergeable-mr.tar.gz | |
changelog and doc6598-notify-only-open-unmergeable-mr
| -rw-r--r-- | changelogs/unreleased/6598-notify-only-open-unmergeable-mr.yml | 5 | ||||
| -rw-r--r-- | doc/workflow/notifications.md | 2 | ||||
| -rw-r--r-- | doc/workflow/todos.md | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/6598-notify-only-open-unmergeable-mr.yml b/changelogs/unreleased/6598-notify-only-open-unmergeable-mr.yml new file mode 100644 index 00000000000..ae92c20fa1a --- /dev/null +++ b/changelogs/unreleased/6598-notify-only-open-unmergeable-mr.yml @@ -0,0 +1,5 @@ +--- +title: Notify conflict for only open merge request +merge_request: 20125 +author: +type: fixed 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. |