diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-08-21 18:50:34 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-08-22 12:33:18 +0300 |
| commit | 539dee96739f1dd8925bd890ec2f9549775a949a (patch) | |
| tree | 392cf6cbe4f5f338f71f512e95a097395448a7f4 /app | |
| parent | fa293df2b7f3f63b72640dbc5e70b539cbd106b1 (diff) | |
Update form to properly set the path
Also includes a change in allowing uploaded files, as there was a
mismatch in object_id between classes, disallowing params[:file], which
is a UploadedFile, newly loaded. The params checked against the older
version.
Fixes gitlab-org/gitlab-ce#36519
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/import/gitlab_projects/new.html.haml | 3 |
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: '' |