<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=577046) </details> <!--IssueSummary end--> <!--- Please read this! Before opening a new issue, make sure to search for keywords in the issues filtered by the "regression" or "type::bug" label: - https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=regression - https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=type::bug and verify the issue you're about to submit isn't a duplicate. ---> ### 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 ](https://docs.gitlab.com/user/project/merge_requests/cherry_pick_changes/#view-system-notes-for-cherry-picked-commit), a system note must be added to to the MR regarding the cherry-pick operation. ### Steps to reproduce 1. Enable `Fast-forward merge` and `Enable merge trains` on a project under **Settings > Merge Requests**. 3. Implement a pipeline with a dummy job to run a merge request pipeline (e.g., `rules: [if: $CI_MERGE_REQUEST_IID]`). 4. Create two branches and add a cherry-pickable commit to one of the branches. 5. Submit a merge request to the project and merge it normally via the train. 6. 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](https://gitlab.zendesk.com/agent/tickets/660720) 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 {width=1054 height=694} ### Output of checks This bug happens on GitLab.com ### Possible fixes <!-- If you can, link to the line of code that might be responsible for the problem. --> ### Patch release information for backports If the bug fix needs to be backported in a [patch release](https://handbook.gitlab.com/handbook/engineering/releases/patch-releases) to a version under [the maintenance policy](https://docs.gitlab.com/policy/maintenance/), please follow the steps on the [patch release runbook for GitLab engineers](https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/patch/engineers.md). Refer to the [internal "Release Information" dashboard](https://dashboards.gitlab.net/d/delivery-release_info/delivery3a-release-information?orgId=1) 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](https://handbook.gitlab.com/handbook/engineering/releases/internal-releases/) for single-tenant SaaS instances, refer to the [internal release process for engineers](https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/internal-releases/engineers.md?ref_type=heads). <!-- If you don't have /label privileges, follow up with an issue comment of `@gitlab-bot label ~"type::bug"` -->