Merge branch '338699-update-draft-alert' into 'master'

Update wording of MR draft alert

See merge request gitlab-org/gitlab!70074

app/assets/javascripts/merge_request.js

@@ -137,7 +137,7 @@ MergeRequest.hideCloseButton = function () {
 MergeRequest.toggleDraftStatus = function (title, isReady) {
   if (isReady) {
     createFlash({
-      message: __('The merge request can now be merged.'),
+      message: __('Marked as ready. Merging is now allowed.'),
       type: 'notice',
     });
   }

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

@@ -124,7 +124,7 @@ export default {
             },
           }) => {
             createFlash({
-              message: __('The merge request can now be merged.'),
+              message: __('Marked as ready. Merging is now allowed.'),
               type: 'notice',
             });
             $('.merge-request .detail-page-description .title').text(title);

locale/gitlab.pot

@@ -20681,6 +20681,9 @@ msgstr ""
 msgid "Marked For Deletion At - %{deletion_time}"
 msgstr ""
 
+msgid "Marked as ready. Merging is now allowed."
+msgstr ""
+
 msgid "Marked this %{noun} as a draft."
 msgstr ""
 
@@ -33713,9 +33716,6 @@ msgstr ""
 msgid "The merge conflicts for this merge request have already been resolved. Please return to the merge request."
 msgstr ""
 
-msgid "The merge request can now be merged."
-msgstr ""
-
 msgid "The metric must be one of %{metrics}."
 msgstr ""
 

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

@@ -64,7 +64,7 @@ describe('Wip', () => {
           expect(vm.isMakingRequest).toBeTruthy();
           expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj);
           expect(createFlash).toHaveBeenCalledWith({
-            message: 'The merge request can now be merged.',
+            message: 'Marked as ready. Merging is now allowed.',
             type: 'notice',
           });
           done();