diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-09-27 05:32:10 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-10-02 19:05:57 +0300 |
| commit | 927861de5abaa78877b1a837ebbcf4b77b737953 (patch) | |
| tree | 089ed85430b5a8a3fec33df6c05de36224d6c383 /app | |
| parent | f1a02ea3e689745b17d91fc8eb18a8b7bab0adc4 (diff) | |
Merge branch '51522-add-new-project-via-import-by-url-auto-populates-slug-but-not-project-name' into 'master'
Resolve "Add new project via import by URL auto populates slug but not project name"
Closes #51522
See merge request gitlab-org/gitlab-ce!21770
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/import/gitlab_projects/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/_new_project_fields.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/import/gitlab_projects/new.html.haml b/app/views/import/gitlab_projects/new.html.haml index c4218f3d787..54330a917e5 100644 --- a/app/views/import/gitlab_projects/new.html.haml +++ b/app/views/import/gitlab_projects/new.html.haml @@ -10,7 +10,7 @@ .row .form-group.project-name.col-sm-12 = label_tag :name, _('Project name'), class: 'label-bold' - = text_field_tag :name, @name, placeholder: "My awesome project", class: "js-project-name form-control input-lg", autofocus: true, required: true + = text_field_tag :name, @name, placeholder: "My awesome project", class: "js-project-name form-control input-lg", autofocus: true .form-group.col-12.col-sm-6 = label_tag :namespace_id, _('Project URL'), class: 'label-bold' .form-group diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml index 3b6090211c0..a8ad98bbbb5 100644 --- a/app/views/projects/_new_project_fields.html.haml +++ b/app/views/projects/_new_project_fields.html.haml @@ -6,7 +6,7 @@ .form-group.project-name.col-sm-12 = f.label :name, class: 'label-bold' do %span= _("Project name") - = f.text_field :name, placeholder: "My awesome project", class: "form-control input-lg", autofocus: true, required: true + = f.text_field :name, placeholder: "My awesome project", class: "form-control input-lg", autofocus: true .form-group.project-path.col-sm-6 = f.label :namespace_id, class: 'label-bold' do %span= s_("Project URL") |