Skip to content

Deployments should track picked merge requests

Alessio Caiazza requested to merge nolith/gitlab-rails:track-picked-mrs into master

What does this MR do?

In order to connect deployment to merge requests when the merge commit is cherry-picked this MR implements a new system note.

When a cherry pick is performed with the API or the web UI, a system note will be added to the merge request. That system note also has a reference to the cherry-pick commit stored in commit_id

When the LinkMergeRequestsServices is executed, it link also cherry-picked merge requests thanks to the new system note.

This new feature is behind the :track_mr_picking feature flag

Related to #36130 (closed)

Screenshots

The new system note will be shown like this (3rd from the top)

Screenshot_2020-01-20_at_15.42.29

Does this MR meet the acceptance criteria?

Conformity

Edited by Yorick Peterse

Merge request reports