Merge branch 'aqualls-ui-message-draft-status' into 'master'

Refine the take-out-of-draft message

See merge request gitlab-org/gitlab!74855

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

@@ -167,11 +167,10 @@ export default {
     <div class="media-body">
       <div class="gl-ml-3 float-left">
         <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 class="gl-display-block text-muted">{{
-          __("Draft merge requests can't be merged.")
-        }}</span>
       </div>
       <gl-button
         v-if="canUpdate"

locale/gitlab.pot

@@ -12446,9 +12446,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-msgid "Draft merge requests can't be merged."
-msgstr ""
-
 msgid "Drag your designs here or %{linkStart}click to upload%{linkEnd}."
 msgstr ""
 
@@ -21784,6 +21781,9 @@ msgstr ""
 msgid "Merge blocked: all merge request dependencies must be merged or closed."
 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."
 msgstr ""
 
@@ -35681,9 +35681,6 @@ msgstr ""
 msgid "This merge request is locked."
 msgstr ""
 
-msgid "This merge request is still a draft."
-msgstr ""
-
 msgid "This merge request was merged. To apply this suggestion, edit this file directly."
 msgstr ""
 

spec/features/merge_request/user_resolves_wip_mr_spec.rb

@@ -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
       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
         click_button('Mark as ready')
@@ -45,7 +45,7 @@ RSpec.describe 'Merge request > User resolves Work in Progress', :js do
       # merge request widget refreshes, which masks missing elements
       # that should already be present.
       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

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

@@ -81,7 +81,9 @@ describe('Wip', () => {
 
     it('should have correct elements', () => {
       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').innerText).toContain('Merge');
       expect(el.querySelector('.js-remove-draft').innerText.replace(/\s\s+/g, ' ')).toContain(