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 {
<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>
......
......@@ -39066,6 +39066,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 ""
......@@ -39102,9 +39105,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 ""
......
......@@ -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
......
......@@ -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.",
);
});
});
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