diff options
author | Stan Hu <stanhu@gmail.com> | 2018-06-05 22:34:06 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-06-06 01:40:55 -0700 |
commit | 3a722ff53fe86ce6194f81ade810196f4f8e870c (patch) | |
tree | 86e7e1b0f8ff5baf148f8f3d03314f942ed0465d /app/assets/javascripts | |
parent | af07c490b2a32ed4c88e387d1133e7882f79abc5 (diff) | |
download | gitlab-ce-3a722ff53fe86ce6194f81ade810196f4f8e870c.tar.gz |
Show a more helpful error for import status
Importing a project from GitHub for a project namespace that already exists
would show an unhelpful error, "An error occurred while importing project."
We now add the base message from Projects::CreateService when this fails.
Closes #47365
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/importer_status.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/importer_status.js b/app/assets/javascripts/importer_status.js index 52455885248..f9ff0722c01 100644 --- a/app/assets/javascripts/importer_status.js +++ b/app/assets/javascripts/importer_status.js @@ -67,7 +67,15 @@ class ImporterStatus { false, )); }) - .catch(() => flash(__('An error occurred while importing project'))); + .catch((error) => { + let details = error; + + if (error.response && error.response.data && error.response.data.errors) { + details = error.response.data.errors; + } + + flash(__(`An error occurred while importing project: ${details}`)); + }); } autoUpdate() { |