Merge branch 'code-import-error-ui-improvements' into 'master'

Improve error message display when project fails to import Follow-up to !1134. New screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/c1a8ffa30ab3b78010e16cf65c2ff438/image.png) See merge request !1138

Merge branch 'code-import-error-ui-improvements' into 'master'
f4cb6e43 · Douwe Maan · 1e73e5dc · fa58a85e · f4cb6e43
Commit f4cb6e43 authored Aug 17, 2015 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

create.js.haml app/views/import/base/create.js.haml +1 -1

No files found.
--- 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>")