Commit 01a3f830 authored by Marin Jankovski's avatar Marin Jankovski

Add template only on new MR create page.

parent da461cd3
...@@ -80,6 +80,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -80,6 +80,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@diffs = compare_action.diffs @diffs = compare_action.diffs
@merge_request.title = @merge_request.source_branch.titleize.humanize @merge_request.title = @merge_request.source_branch.titleize.humanize
@merge_request.description = @merge_request.target_project.merge_requests_template
@target_project = @merge_request.target_project @target_project = @merge_request.target_project
@target_repo = @target_project.repository @target_repo = @target_project.repository
end end
......
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
.form-group .form-group
= f.label :description, "Description", class: 'control-label' = f.label :description, "Description", class: 'control-label'
.col-sm-10 .col-sm-10
- template = @project.merge_requests_template = f.text_area :description, class: "form-control js-gfm-input", rows: 14
= f.text_area :description, value: template, class: "form-control js-gfm-input", rows: 14
%p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. %p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
%hr %hr
.form-group .form-group
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment