summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2017-08-15 14:19:30 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2017-08-17 09:41:09 +0200
commit1d8025feca1a3f5a18dbf2b3dea6a073e0c1d4b4 (patch)
tree75d8f76a1f2f6b0cedc341dba7ca31755d582566 /app
parent87f082de455c784a6beb5d7005a564cfbf8c6bf9 (diff)
downloadgitlab-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
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects_controller.rb2
-rw-r--r--app/views/projects/new.html.haml2
2 files changed, 2 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