Cherry-pick system note not added to merge requests when using fast-forward merge with merge trains
Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.
Summary
When a project is configured with both Fast-forward merge and Enable merge trains, cherry-picking a merged merge request does not add the expected system note to the merge request's activity log.
As per Cherry-pick changes , a system note must be added to to the MR regarding the cherry-pick operation.
Steps to reproduce
- Enable
Fast-forward mergeandEnable merge trainson a project under Settings > Merge Requests. - Implement a pipeline with a dummy job to run a merge request pipeline (e.g.,
rules: [if: $CI_MERGE_REQUEST_IID]). - Create two branches and add a cherry-pickable commit to one of the branches.
- Submit a merge request to the project and merge it normally via the train.
- Click Cherry-pick, select the other branch to pick it onto, uncheck Start a new merge request with these changes, and click Cherry-pick.
Example Project
Check ZD ticket for sample projects (internal use only).
What is the current bug behavior?
System note does not get added.
What is the expected correct behavior?
System note must be added.
Relevant logs and/or screenshots
Output of checks
This bug happens on GitLab.com
Possible fixes
Patch release information for backports
If the bug fix needs to be backported in a patch release to a version under the maintenance policy, please follow the steps on the patch release runbook for GitLab engineers.
Refer to the internal "Release Information" dashboard for information about the next patch release, including the targeted versions, expected release date, and current status.
High-severity bug remediation
To remediate high-severity issues requiring an internal release for single-tenant SaaS instances, refer to the internal release process for engineers.