Commit b7218a5b authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '329758-improve-fork-error' into 'master'

Improve fork error message

See merge request gitlab-org/gitlab!62664
parents fbababa9 1d45ae6f
...@@ -222,7 +222,11 @@ export default { ...@@ -222,7 +222,11 @@ export default {
redirectTo(data.web_url); redirectTo(data.web_url);
return; return;
} catch (error) { } catch (error) {
createFlash({ message: error }); createFlash({
message: s__(
'ForkProject|An error occurred while forking the project. Please try again.',
),
});
} }
}, },
}, },
......
...@@ -14311,6 +14311,9 @@ msgstr "" ...@@ -14311,6 +14311,9 @@ msgstr ""
msgid "ForkProject|A fork is a copy of a project." msgid "ForkProject|A fork is a copy of a project."
msgstr "" msgstr ""
msgid "ForkProject|An error occurred while forking the project. Please try again."
msgstr ""
msgid "ForkProject|Cancel" msgid "ForkProject|Cancel"
msgstr "" msgstr ""
......
...@@ -356,7 +356,7 @@ describe('ForkForm component', () => { ...@@ -356,7 +356,7 @@ describe('ForkForm component', () => {
expect(urlUtility.redirectTo).not.toHaveBeenCalled(); expect(urlUtility.redirectTo).not.toHaveBeenCalled();
expect(createFlash).toHaveBeenCalledWith({ expect(createFlash).toHaveBeenCalledWith({
message: dummyError, message: 'An error occurred while forking the project. Please try again.',
}); });
}); });
}); });
......
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