Merge branch 'zj-fix-fe-posting-value' into 'master'

Fix project templates and add docs

Closes #36492

See merge request !13563

app/views/projects/_project_templates.html.haml

@@ -5,6 +5,6 @@
     Blank
   - Gitlab::ProjectTemplate.all.each do |template|
     .btn
-      %input{ type: "radio",  autocomplete: "off", name: "project_templates", id: template.name }
+      %input{ type: "radio",  autocomplete: "off", name: "project[template_name]", id: template.name, value: template.name }
       = custom_icon(template.logo)
       = template.title

app/views/projects/new.html.haml

@@ -25,7 +25,7 @@
               .form-group
                 = f.label :template_project, class: 'label-light' do
                   Create from template
-                  = link_to icon('question-circle'), help_page_path("public_access/public_access"), aria: { label: "What’s included in a template?" }, title: "What’s included in a template?", class: 'has-tooltip', data: { placement: 'top'}
+                  = link_to icon('question-circle'), help_page_path("gitlab-basics/create-project"), target: '_blank', aria: { label: "What’s included in a template?" }, title: "What’s included in a template?", class: 'has-tooltip', data: { placement: 'top'}
                 %div
                   = render 'project_templates', f: f
           .second-column

doc/gitlab-basics/create-project.md

@@ -25,4 +25,11 @@
 
 1. Click **Create project**.
 
+## From a template
+
+To kickstart your development GitLab projects can be started from a template.
+For example, one of the templates included is Ruby on Rails. When filling out the 
+form for new projects, click the 'Ruby on Rails' button. During project creation,
+this will import a Ruby on Rails template with GitLab CI preconfigured.
+
 [import it]: ../workflow/importing/README.md

spec/features/projects_spec.rb

@@ -18,7 +18,7 @@ feature 'Project' do
         click_button "Create project"
       end
 
-      expect(page).to have_content 'This project Loading..'
+      expect(page).to have_content template.name
     end
   end