Merge branch 'nfriend-atmtwps-merge-immediately-dialog' into 'master'

Show "merge immediately" dialog when MR's pipeline has not yet finished

See merge request gitlab-org/gitlab!21556

changelogs/unreleased/nfriend-atmtwps-merge-immediately-dialog.yml

+---
+title: Show merge immediately dialog even if the MR's pipeline hasn't finished
+merge_request: 21556
+author:
+type: changed

ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js

@@ -50,7 +50,7 @@ export default {
       return this.mr.isPipelineActive && !this.mr.onlyAllowMergeIfPipelineSucceeds;
     },
     isMergeImmediatelyDangerous() {
-      return this.mr.preferredAutoMergeStrategy === MT_MERGE_STRATEGY;
+      return [MT_MERGE_STRATEGY, MTWPS_MERGE_STRATEGY].includes(this.mr.preferredAutoMergeStrategy);
     },
   },
 };

ee/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js

@@ -154,7 +154,7 @@ describe('ReadyToMerge', () => {
     });
 
     describe('isMergeImmediatelyDangerous', () => {
-      it('should return false if the preferred auto merge strategy is not merge trains', () => {
+      it('should return false if the preferred auto merge strategy is not merge train-related', () => {
         factory({ preferredAutoMergeStrategy: MWPS_MERGE_STRATEGY });
 
         expect(vm.isMergeImmediatelyDangerous).toBe(false);
@@ -165,6 +165,12 @@ describe('ReadyToMerge', () => {
 
         expect(vm.isMergeImmediatelyDangerous).toBe(true);
       });
+
+      it('should return true if the preferred auto merge strategy is merge trains when pipeline succeeds', () => {
+        factory({ preferredAutoMergeStrategy: MTWPS_MERGE_STRATEGY });
+
+        expect(vm.isMergeImmediatelyDangerous).toBe(true);
+      });
     });
   });