Skip to content
Snippets Groups Projects
Commit 44a95c5d authored by Phil Hughes's avatar Phil Hughes
Browse files

Added back text used on merge commit message

parent 6333ebe6
No related branches found
No related tags found
1 merge request!3564Prefills commit message in edit file
Pipeline #
Loading
@@ -6,7 +6,7 @@
Loading
@@ -6,7 +6,7 @@
.commit-message-container .commit-message-container
.max-width-marker .max-width-marker
= text_area_tag 'commit_message', = text_area_tag 'commit_message',
(params[:commit_message] || local_assigns[:placeholder]), (params[:commit_message] || local_assigns[:text] || local_assigns[:placeholder]),
class: 'form-control js-commit-message', placeholder: local_assigns[:placeholder], class: 'form-control js-commit-message', placeholder: local_assigns[:placeholder],
required: true, rows: (local_assigns[:rows] || 3), required: true, rows: (local_assigns[:rows] || 3),
id: "commit_message-#{nonce}" id: "commit_message-#{nonce}"
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment