Improve `Merge` button experience for different states
Problem to solve
This is a follow up of In !27490 (comment 354476813)
We are currently not informative enough through our UI in the merge request widget merge section towards informing the user for when a pipeline is skipped and the merge request is mergable.
This issue fixes the remaining scope as discussed in the functional review at !27490 (comment 352627812)
Intended users
User experience goal
Proposal
To be changed:
Merge request widget:
-
c1
- Introduce tooltip on merge button which states:
The pipeline for this merge request failed
- Introduce tooltip on merge button which states:
-
d1
- Merge button variant to change to
warning
- Introduce tooltip on merge button which states:
The pipeline for this merge request has been skipped
- Merge button variant to change to
-
c2
- The merge warning copy to change to
The pipeline for this merge request failed. Please retry the pipeline or push a new commit to fix the failure.
- The merge warning copy to change to
-
d2
- The merge warning copy to change to
The pipeline for this merge request has been skipped. Please run a new pipeline.
- The merge warning copy to change to
-
d3
- Merge button variant to change to
warning
- Introduce tooltip on merge button which states:
The pipeline for this merge request has been skipped
- Merge button variant to change to
More info on button variants: https://design.gitlab.com/components/button/#warning
Further details
Reference material
Comment a. Settings > General b. Pipeline passed 💚 c. Pipeline failed 🔴 d. Pipeline skipped ⚪ 1. All disabled 2. Pipelines must succeed 3. Pipelines must succeed + Skipped pipelines are allowed