diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-08-15 14:19:30 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-08-17 09:41:09 +0200 |
| commit | 1d8025feca1a3f5a18dbf2b3dea6a073e0c1d4b4 (patch) | |
| tree | 75d8f76a1f2f6b0cedc341dba7ca31755d582566 | |
| parent | 87f082de455c784a6beb5d7005a564cfbf8c6bf9 (diff) | |
| download | gitlab-ce-1d8025feca1a3f5a18dbf2b3dea6a073e0c1d4b4.tar.gz | |
Document project templates and link to it
The link pointed to the wrong page, this is corrected by both writing
the documentation and linking to that instead.
(internal)
Reference: https://gitlab.slack.com/archives/C0NFPSFA8/p1502791719000238
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/new.html.haml | 2 | ||||
| -rw-r--r-- | doc/gitlab-basics/create-project.md | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 150bd591f21..1d24563a6a6 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -28,7 +28,7 @@ class ProjectsController < Projects::ApplicationController end def create - @project = ::Projects::CreateService.new(current_user, project_params.merge(template_name: params[:template_name])).execute + @project = ::Projects::CreateService.new(current_user, project_params).execute if @project.saved? cookies[:issue_board_welcome_hidden] = { path: project_path(@project), value: nil, expires: Time.at(0) } diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index e3bbebbcf4c..647e0a772b1 100644 --- a/app/views/projects/new.html.haml +++ b/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 diff --git a/doc/gitlab-basics/create-project.md b/doc/gitlab-basics/create-project.md index 763ebc70ed0..b4b77a2f94b 100644 --- a/doc/gitlab-basics/create-project.md +++ b/doc/gitlab-basics/create-project.md @@ -29,5 +29,12 @@ 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 [reserved]: ../user/reserved_names.md |