diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-12 15:53:14 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-12 15:53:14 +0000 |
| commit | 2082879d2f3f91b038863f7c67c658d678924564 (patch) | |
| tree | 87b5b326d48c253eda683ba009403a5d66b6d41d | |
| parent | 63265243b5788db35f1c4953f5d0a4255841ac77 (diff) | |
| parent | 44a95c5dea278d9d835030e3cab8e9e7bead0b44 (diff) | |
| download | gitlab-ce-2082879d2f3f91b038863f7c67c658d678924564.tar.gz | |
Merge branch 'commit-message-prefilled' into 'master'
Prefills commit message in edit file
See #14488
See merge request !3564
| -rw-r--r-- | app/views/shared/_commit_message_container.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/_commit_message_container.html.haml b/app/views/shared/_commit_message_container.html.haml index 7afbaeddee8..0a38327baa2 100644 --- a/app/views/shared/_commit_message_container.html.haml +++ b/app/views/shared/_commit_message_container.html.haml @@ -6,7 +6,7 @@ .commit-message-container .max-width-marker = text_area_tag 'commit_message', - (params[:commit_message] || local_assigns[:text]), + (params[:commit_message] || local_assigns[:text] || local_assigns[:placeholder]), class: 'form-control js-commit-message', placeholder: local_assigns[:placeholder], required: true, rows: (local_assigns[:rows] || 3), id: "commit_message-#{nonce}" |