diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-17 23:31:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-17 23:31:51 +0000 |
| commit | f4cb6e438ab3cb03589c5ba36dc2b23c78b66c5a (patch) | |
| tree | f1c128664cf2e802448b2d6153ea4908610c36f8 | |
| parent | 1e73e5dc1440ca7fcaf77ce5655f8c478a9185d2 (diff) | |
| parent | fa58a85ed0da17fb7c0e24aac0d08dd2b91f06e8 (diff) | |
| download | gitlab-ce-f4cb6e438ab3cb03589c5ba36dc2b23c78b66c5a.tar.gz | |
Merge branch 'code-import-error-ui-improvements' into 'master'
Improve error message display when project fails to import
Follow-up to !1134.
New screenshot:
See merge request !1138
| -rw-r--r-- | app/views/import/base/create.js.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/import/base/create.js.haml b/app/views/import/base/create.js.haml index 9529f16c128..d8af0295b2d 100644 --- a/app/views/import/base/create.js.haml +++ b/app/views/import/base/create.js.haml @@ -26,4 +26,4 @@ - else :plain job = $("tr#repo_#{@repo_id}") - job.find(".import-actions").html("<p class='alert alert-danger'>Error saving project: #{escape_javascript(@project.errors.messages.to_s)}</p>") + job.find(".import-actions").html("<i class='fa fa-exclamation-circle'> Error saving project: #{escape_javascript(@project.errors.full_messages.join(','))}</i>") |