1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
index cf6472f2c8c..83789f10285 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
@@ -1,9 +1,13 @@
 import { __ } from '~/locale';
 
 export const MERGE_DISABLED_TEXT = __('You can only merge once the items above are resolved.');
+export const MERGE_DISABLED_SKIPPED_PIPELINE_TEXT = __(
+  "Merge blocked: pipeline must succeed. It's waiting for a manual job to continue.",
+);
 export const PIPELINE_MUST_SUCCEED_CONFLICT_TEXT = __(
   'A CI/CD pipeline must run and be successful before merge.',
 );
+export const PIPELINE_SKIPPED_STATUS = 'SKIPPED';
 
 export default {
   computed: {
@@ -17,6 +21,10 @@ export default {
       );
     },
     mergeDisabledText() {
+      if (this.pipeline?.status === PIPELINE_SKIPPED_STATUS) {
+        return MERGE_DISABLED_SKIPPED_PIPELINE_TEXT;
+      }
+
       return MERGE_DISABLED_TEXT;
     },
     pipelineMustSucceedConflictText() {