Merge branch '323061-aqualls-blocked-pipeline' into 'master'

Initial message for blocked pipeline in MRs

See merge request gitlab-org/gitlab!59691

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue

@@ -14,8 +14,9 @@ export default {
     <div class="media-body space-children">
       <span class="bold">
         {{
-          s__(`mrWidget|Pipeline blocked.
-The pipeline for this merge request requires a manual action to proceed`)
+          s__(
+            `mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue.`,
+          )
         }}
       </span>
     </div>

locale/gitlab.pot

@@ -38877,6 +38877,9 @@ msgstr ""
 msgid "mrWidget|Merge blocked: all threads must be resolved."
 msgstr ""
 
+msgid "mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue."
+msgstr ""
+
 msgid "mrWidget|Merge failed."
 msgstr ""
 
@@ -38913,9 +38916,6 @@ msgstr ""
 msgid "mrWidget|Open in Web IDE"
 msgstr ""
 
-msgid "mrWidget|Pipeline blocked. The pipeline for this merge request requires a manual action to proceed"
-msgstr ""
-
 msgid "mrWidget|Plain diff"
 msgstr ""
 

spec/features/merge_request/user_sees_merge_widget_spec.rb

@@ -154,9 +154,9 @@ RSpec.describe 'Merge request > User sees merge widget', :js do
     end
 
     it 'shows information about blocked pipeline' do
-      expect(page).to have_content("Pipeline blocked")
+      expect(page).to have_content("Merge blocked")
       expect(page).to have_content(
-        "The pipeline for this merge request requires a manual action")
+        "pipeline must succeed. It's waiting for a manual action to continue.")
       expect(page).to have_css('.ci-status-icon-manual')
     end
   end

spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js

@@ -22,7 +22,7 @@ describe('MRWidgetPipelineBlocked', () => {
     createWrapper();
 
     expect(wrapper.text()).toBe(
-      'Pipeline blocked. The pipeline for this merge request requires a manual action to proceed',
+      "Merge blocked: pipeline must succeed. It's waiting for a manual action to continue.",
     );
   });
 });