Commit 6e3dbc52 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Update wording of MR draft alert

parent 36157228
......@@ -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',
});
}
......
......@@ -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);
......
......@@ -20579,6 +20579,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 ""
......@@ -33554,9 +33557,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 ""
......
......@@ -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();
......
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