Improve MR merge widget UI text
Problem
Currently the MRs merge widget shows different messages that communicate the “mergeability” of the MR, what's blocking the MR, and what the user can/should do. The problem is that those messages are not all concise, clear, and consistent between them.
-
Inconsistent structure: For example, when all threads must be resolved and there's an unresolved thread, we say
Before this can be merged, one or more threads must be resolved.
A different structure is then used when required approvals are missing:You can only merge once this merge request is approved.
-
Different MR verbiage: Sometimes we say
merge this request
, other times we saymerge this merge request
, or justmerge this
. -
Different pronouns: Sometimes direct the message by using
you
, other times we don't. Note that even whenyou
is used, the user seeing that message may not actually be able to do anything. For example, even if the user can't merge they can sometimes see this message:You can only merge once the items above are resolved.
- Lack of humanity: Even when it's time to celebrate, because the MR is ready to be merged, is merging, or has been merged, we display robotic messages. Can we make our humanity shine through a bit?
Related to the Lovable merge button epic: &1381
Resources
To see when and how each messages is shown in the merge widget, see the states mapping and screenshots.
Proposal
Current | Proposal |
---|---|
Fast-forward merge is not possible. Rebase the source branch onto {target branch name} to allow this merge request to be merged. |
Merge blocked: the source branch must be rebased onto the target branch. (?) ? popover: Rebase adds any changes from the target branch to the source branch. It's required before merging in projects using the fast-forward merge strategy. [Learn more](https://docs.gitlab.com/ee/topics/git/git_rebase.html)
|
Before this can be merged, one or more threads must be resolved. |
X threads must be resolved |
Pipeline blocked. The pipeline for this merge request requires a manual action to proceed. |
Pipeline must succeed. Pipeline waiting for manual action. |
Ready to be merged automatically. Ask someone with write access to this repository to merge this request |
Can be merged by members who can write to the target branch. |
This merge request is in the process of being merged |
Merging, drum roll please… |
Fork project merge requests do not create merge request pipelines that validate a post merge result unless invoked by a project member. |
Pipeline may be inaccurate because it used the fork project’s CI/CD configuration. For better results, run a pipeline in this project. This one actually has an issue for it: #208300 (closed)
|
Allows commits from members who can merge to the target branch |
The fork project allows commits from members who can write to the target branch. [More information](https://docs.gitlab.com/ee/user/project/merge_requests/allow_collaboration.html#enabling-commit-edits-from-upstream-members) |
Edited by Amy Qualls