Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-11-11 18:22:51 +0300
committerDouwe Maan <douwe@gitlab.com>2015-11-18 14:00:56 +0300
commit841a7c6897b23957286056498cc3f05ec4330d15 (patch)
treedba78089ddaa57ce67ac251a1565b17d54fa79b3 /app/views/projects/imports
parent531177757eef772cc7ce5dd3898c3e6803187ed6 (diff)
Store and show reason why import failed.
Diffstat (limited to 'app/views/projects/imports')
-rw-r--r--app/views/projects/imports/new.html.haml12
1 files changed, 8 insertions, 4 deletions
diff --git a/app/views/projects/imports/new.html.haml b/app/views/projects/imports/new.html.haml
index 92a87690c54..f7b4416d87e 100644
--- a/app/views/projects/imports/new.html.haml
+++ b/app/views/projects/imports/new.html.haml
@@ -1,12 +1,16 @@
- page_title "Import repository"
%h3.page-title
- - if @project.import_failed?
- Import failed. Retry?
- - else
- Import repository
+ Import repository
%hr
+- if @project.import_failed?
+ .alert.alert-danger
+ %p The repository could not be imported.
+ %pre.prepend-top-10
+ :preserve
+ #{@project.import_error.try(:strip)}
+
= form_for @project, url: namespace_project_import_path(@project.namespace, @project), method: :post, html: { class: 'form-horizontal' } do |f|
.form-group.import-url-data
= f.label :import_url, class: 'control-label' do