From 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 20 Aug 2020 18:42:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-3-stable-ee --- doc/user/todos.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'doc/user/todos.md') diff --git a/doc/user/todos.md b/doc/user/todos.md index ef0e75bc197..02fef07a89a 100644 --- a/doc/user/todos.md +++ b/doc/user/todos.md @@ -43,9 +43,15 @@ A To Do appears on your To-Do List when: - Commit - Design - The CI/CD pipeline for your merge request failed -- An open merge request becomes unmergeable due to conflict, and you are either: - - The author - - Have set it to automatically merge once the pipeline succeeds +- An open merge request becomes unmergeable due to conflict, and one of the following is true: + - You are the author + - You are the user that set it to automatically merge once the pipeline succeeds +- [Since GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/12136), a merge request + is removed from a [merge train](../ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md) + and you are the user that added it. **(PREMIUM)** + +When multiple trigger actions occur for the same user on the same object (for example, an issue) +only the first is displayed as a single to-do on their To-Do List. To-do triggers are not affected by [GitLab Notification Email settings](profile/notifications.md). -- cgit v1.2.3