Commit 8676e062 authored by Amy Qualls's avatar Amy Qualls Committed by Phil Hughes

Initial message for blocked pipeline in MRs

parent 51040942
...@@ -14,8 +14,9 @@ export default { ...@@ -14,8 +14,9 @@ export default {
<div class="media-body space-children"> <div class="media-body space-children">
<span class="bold"> <span class="bold">
{{ {{
s__(`mrWidget|Pipeline blocked. s__(
The pipeline for this merge request requires a manual action to proceed`) `mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue.`,
)
}} }}
</span> </span>
</div> </div>
......
...@@ -39066,6 +39066,9 @@ msgstr "" ...@@ -39066,6 +39066,9 @@ msgstr ""
msgid "mrWidget|Merge blocked: all threads must be resolved." msgid "mrWidget|Merge blocked: all threads must be resolved."
msgstr "" msgstr ""
msgid "mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue."
msgstr ""
msgid "mrWidget|Merge failed." msgid "mrWidget|Merge failed."
msgstr "" msgstr ""
...@@ -39102,9 +39105,6 @@ msgstr "" ...@@ -39102,9 +39105,6 @@ msgstr ""
msgid "mrWidget|Open in Web IDE" msgid "mrWidget|Open in Web IDE"
msgstr "" msgstr ""
msgid "mrWidget|Pipeline blocked. The pipeline for this merge request requires a manual action to proceed"
msgstr ""
msgid "mrWidget|Plain diff" msgid "mrWidget|Plain diff"
msgstr "" msgstr ""
......
...@@ -154,9 +154,9 @@ RSpec.describe 'Merge request > User sees merge widget', :js do ...@@ -154,9 +154,9 @@ RSpec.describe 'Merge request > User sees merge widget', :js do
end end
it 'shows information about blocked pipeline' do 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( 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') expect(page).to have_css('.ci-status-icon-manual')
end end
end end
......
...@@ -22,7 +22,7 @@ describe('MRWidgetPipelineBlocked', () => { ...@@ -22,7 +22,7 @@ describe('MRWidgetPipelineBlocked', () => {
createWrapper(); createWrapper();
expect(wrapper.text()).toBe( 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.",
); );
}); });
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment