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
path: root/app/views
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-08-22 16:57:33 +0300
committerDouwe Maan <douwe@gitlab.com>2017-08-22 16:57:33 +0300
commit8654b771588fff719aa313cd115b0c6fa4ab36f3 (patch)
tree284f4a05ddb4fc4c8354a659eebc9d39673cfcba /app/views
parentce89c425fe51d2317322350bbd8a364c08d97d21 (diff)
parent539dee96739f1dd8925bd890ec2f9549775a949a (diff)
Merge branch 'zj-fix-import-gitlab-export-form' into 'master'
Update form to properly set the path Closes #36519 See merge request !13722
Diffstat (limited to 'app/views')
-rw-r--r--app/views/import/gitlab_projects/new.html.haml3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/import/gitlab_projects/new.html.haml b/app/views/import/gitlab_projects/new.html.haml
index 008e8287aa3..5d68e1e2156 100644
--- a/app/views/import/gitlab_projects/new.html.haml
+++ b/app/views/import/gitlab_projects/new.html.haml
@@ -25,7 +25,7 @@
= hidden_field_tag :namespace_id, value: current_user.namespace_id
.form-group.col-xs-12.col-sm-6.project-path
= label_tag :path, 'Project name', class: 'label-light'
- = text_field_tag :path, nil, placeholder: "my-awesome-project", class: "js-path-name form-control", tabindex: 2, autofocus: true, required: true
+ = text_field_tag :path, @path, placeholder: "my-awesome-project", class: "js-path-name form-control", tabindex: 2, autofocus: true, required: true
.row
.form-group.col-md-12
@@ -33,7 +33,6 @@
.row
.form-group.col-sm-12
= hidden_field_tag :namespace_id, @namespace.id
- = hidden_field_tag :path, @path
= label_tag :file, 'GitLab project export', class: 'label-light'
.form-group
= file_field_tag :file, class: ''