Loading
Fix swapped fork notices in MergeRequestPresenter
What does this MR do and why?
The revert_in_fork_path and cherry_pick_in_fork_path methods in MergeRequestPresenter build a fork URL with "continue" params. When a user who cannot push to a project tries to revert or cherry-pick a commit from a merged merge request, GitLab offers to fork the project. After the fork is created, the user sees a notice asking them to try the action again.
The two notice strings were swapped. The revert flow said "Try to cherry-pick this commit again.", and the cherry-pick flow said "Try to revert this commit again." This is a minor text issue, but it can point users at the wrong action. The strings have been swapped since the presenter was introduced.
This MR swaps the two strings so each method names its own action. There is no change to locale/gitlab.pot, because both translation strings already exist and remain in use. They are only exchanged between the two methods. No spec changes are included, because no existing spec asserts these notice strings.
References
- Prior MR where the issue was spotted: !258059 (merged)
- Review comment where this follow-up was promised: !258059 (comment 3932944700)
- Commit that introduced the presenter: 7d157a8a
Screenshots or screen recordings
Screenshots are omitted because the change is only to the text of a flash notice in a multi-step fork flow.
How to set up and validate locally
- In GDK, sign in as a user who can fork a project but cannot push to it, for example a non-member on a public project.
- Open a merged merge request in that project.
- Select Revert and follow the prompt to fork the project.
- After the fork is created, confirm the notice says "Try to revert this commit again." Before this change, it said to cherry-pick.
- Go back to the merged merge request and select Cherry-pick. Follow the prompt to fork the project.
- Confirm the notice says "Try to cherry-pick this commit again."
MR acceptance checklist
Evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.