Commit f4cb6e43 authored by Douwe Maan's avatar Douwe Maan

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
parents 1e73e5dc fa58a85e
...@@ -26,4 +26,4 @@ ...@@ -26,4 +26,4 @@
- else - else
:plain :plain
job = $("tr#repo_#{@repo_id}") 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>")
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