Skip to content

Add TODO task when MR is removed from Merge Train by the system

Problem to solve

There is no notification to the user when an MR is dropped from a train.

\text{When } \underline{\text{ a merge request is dropped from a merge train }} \newline\text{, I want to } \underline{\text{ be made aware of this }} \newline\text{ so I can } \underline{\text{ resolve the reason why and get my merge request merged }}

Intended users

User experience goal

Proposal

  • Cancel means a user removed a merge request from a merge train (e.g. user realized that the MR had a bug).
  • Abort means the merge request was removed from a merge train by the system (e.g. there was a merge conflict and requires user interaction to resolve it).

If the merge request was removed from a merge train by the system we need to alert the user of this. If the merge request was canceled by the user we do not need to alert the user of this.

The merge author (triggerer of the merge) of the merge request should receive a TODO in that case.

TODO:

  • Type: Merge request
  • Action: Merge (new)
  • Copy: Removed from Merge Train <MR ID> "[MR TITLE]" at [NAME SPACE] · [TIME AGO]
  • Example:
ScreenshotMockup (browser made)
TODO_notification

Further details

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13767/diffs#note_181000683

Consider that:

  1. cancel as user action should not generate for example TODOs,
  2. failure as an event of system failing to execute action should likely generate TODOs.

Permissions and Security

Documentation

Availability & Testing

  • Unit test changes: Required, there should be new unit test for every newly added logic accordingly
  • End-to-end test change: Required, this is a good candidate for a new E2E test, please see proposal test case for more details.

What does success look like, and how can we measure that?

What is the type of buyer?

Is this a cross-stage feature?

Links / references

Follow ups

  • Additionally, notify the merge request author if it is not the same person as the merge author/triggerer (Potentially)
Edited by Tiffany Rea