Fix padding in the Ready to Merge MR widget
What does this MR do and why?
Fixes #386457 (closed)
Screenshots or screen recordings
Before | After |
---|---|
![]() |
![]() |
![]() |
![]() |
How to set up and validate locally
- Open any MR
- Apply this patch to see the ready to merge widget with merge details:
show-ready-to-merge.patch
Index: app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue (revision 9468418a1b8c98db152b8f04292da0a501e59c7a)
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue (date 1675729224186)
@@ -164,6 +164,7 @@
return this.mr.state !== 'nothingToMerge';
},
componentName() {
+ return 'MrWidgetReadyToMerge';
return stateToComponentMap[this.machineState] || classState[this.mr.state];
},
hasPipelineMustSucceedConflict() {
- Resize the viewport to desktop and back to mobile (this is important!)
- Apply this patch to see merge controls:
merge-controls.patch
Index: app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue (revision 9468418a1b8c98db152b8f04292da0a501e59c7a)
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue (date 1675730011835)
@@ -277,6 +277,7 @@
return this.isMergeButtonDisabled;
},
shouldShowSquashBeforeMerge() {
+ return true;
const { enableSquashBeforeMerge } = this.mr;
if (this.isSquashReadOnly && !this.squashIsSelected) {
@@ -298,6 +299,7 @@
return this.preferredAutoMergeStrategy === MT_MERGE_STRATEGY && this.isPipelineFailed;
},
shouldShowMergeControls() {
+ return true;
return (
(this.isMergeAllowed || this.isAutoMergeAvailable) &&
(this.stateData.userPermissions?.canMerge || this.mr.canMerge) &&
- Refresh the page resize the viewport as in the step 3.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Edited by Ali Ndlovu