Commit 0d54e6a9 authored by Amy Qualls's avatar Amy Qualls Committed by Paul Slaughter

Refine the take-out-of-draft message

This message uses two lines, but it only needs one. I refined it
past what Pedro initially suggested.
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74855

Changelog: changed
parent 786a8905
...@@ -167,11 +167,10 @@ export default { ...@@ -167,11 +167,10 @@ export default {
<div class="media-body"> <div class="media-body">
<div class="gl-ml-3 float-left"> <div class="gl-ml-3 float-left">
<span class="gl-font-weight-bold"> <span class="gl-font-weight-bold">
{{ __('This merge request is still a draft.') }} {{
__("Merge blocked: merge request must be marked as ready. It's still marked as draft.")
}}
</span> </span>
<span class="gl-display-block text-muted">{{
__("Draft merge requests can't be merged.")
}}</span>
</div> </div>
<gl-button <gl-button
v-if="canUpdate" v-if="canUpdate"
......
...@@ -12432,9 +12432,6 @@ msgstr "" ...@@ -12432,9 +12432,6 @@ msgstr ""
msgid "Draft" msgid "Draft"
msgstr "" msgstr ""
msgid "Draft merge requests can't be merged."
msgstr ""
msgid "Drag your designs here or %{linkStart}click to upload%{linkEnd}." msgid "Drag your designs here or %{linkStart}click to upload%{linkEnd}."
msgstr "" msgstr ""
...@@ -21740,6 +21737,9 @@ msgstr "" ...@@ -21740,6 +21737,9 @@ msgstr ""
msgid "Merge blocked: all merge request dependencies must be merged or closed." msgid "Merge blocked: all merge request dependencies must be merged or closed."
msgstr "" msgstr ""
msgid "Merge blocked: merge request must be marked as ready. It's still marked as draft."
msgstr ""
msgid "Merge blocked: new changes were just added." msgid "Merge blocked: new changes were just added."
msgstr "" msgstr ""
...@@ -35595,9 +35595,6 @@ msgstr "" ...@@ -35595,9 +35595,6 @@ msgstr ""
msgid "This merge request is locked." msgid "This merge request is locked."
msgstr "" msgstr ""
msgid "This merge request is still a draft."
msgstr ""
msgid "This merge request was merged. To apply this suggestion, edit this file directly." msgid "This merge request was merged. To apply this suggestion, edit this file directly."
msgstr "" msgstr ""
......
...@@ -33,7 +33,7 @@ RSpec.describe 'Merge request > User resolves Work in Progress', :js do ...@@ -33,7 +33,7 @@ RSpec.describe 'Merge request > User resolves Work in Progress', :js do
it 'retains merge request data after clicking Resolve WIP status' do it 'retains merge request data after clicking Resolve WIP status' do
expect(page.find('.ci-widget-content')).to have_content("Pipeline ##{pipeline.id}") expect(page.find('.ci-widget-content')).to have_content("Pipeline ##{pipeline.id}")
expect(page).to have_content "This merge request is still a draft." expect(page).to have_content "Merge blocked: merge request must be marked as ready. It's still marked as draft."
page.within('.mr-state-widget') do page.within('.mr-state-widget') do
click_button('Mark as ready') click_button('Mark as ready')
...@@ -45,7 +45,7 @@ RSpec.describe 'Merge request > User resolves Work in Progress', :js do ...@@ -45,7 +45,7 @@ RSpec.describe 'Merge request > User resolves Work in Progress', :js do
# merge request widget refreshes, which masks missing elements # merge request widget refreshes, which masks missing elements
# that should already be present. # that should already be present.
expect(page.find('.ci-widget-content', wait: 0)).to have_content("Pipeline ##{pipeline.id}") expect(page.find('.ci-widget-content', wait: 0)).to have_content("Pipeline ##{pipeline.id}")
expect(page).not_to have_content('This merge request is still a draft.') expect(page).not_to have_content("Merge blocked: merge request must be marked as ready. It's still marked as draft.")
end end
end end
end end
...@@ -81,7 +81,9 @@ describe('Wip', () => { ...@@ -81,7 +81,9 @@ describe('Wip', () => {
it('should have correct elements', () => { it('should have correct elements', () => {
expect(el.classList.contains('mr-widget-body')).toBeTruthy(); expect(el.classList.contains('mr-widget-body')).toBeTruthy();
expect(el.innerText).toContain('This merge request is still a draft.'); expect(el.innerText).toContain(
"Merge blocked: merge request must be marked as ready. It's still marked as draft.",
);
expect(el.querySelector('button').getAttribute('disabled')).toBeTruthy(); expect(el.querySelector('button').getAttribute('disabled')).toBeTruthy();
expect(el.querySelector('button').innerText).toContain('Merge'); expect(el.querySelector('button').innerText).toContain('Merge');
expect(el.querySelector('.js-remove-draft').innerText.replace(/\s\s+/g, ' ')).toContain( expect(el.querySelector('.js-remove-draft').innerText.replace(/\s\s+/g, ' ')).toContain(
......
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