summaryrefslogtreecommitdiff
path: root/app/views/shared/_commit_message_container.html.haml
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-04-11 17:41:47 +0100
committerPhil Hughes <me@iamphill.com>2016-04-11 17:41:47 +0100
commit44a95c5dea278d9d835030e3cab8e9e7bead0b44 (patch)
tree038c2399dd70a9517bb5b52dee219102795b3c7c /app/views/shared/_commit_message_container.html.haml
parent6333ebe619848aaec3811c9e8908c017317c019f (diff)
downloadgitlab-ce-44a95c5dea278d9d835030e3cab8e9e7bead0b44.tar.gz
Added back text used on merge commit messagecommit-message-prefilled
Diffstat (limited to 'app/views/shared/_commit_message_container.html.haml')
-rw-r--r--app/views/shared/_commit_message_container.html.haml2
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 eeb4e2f5563..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[:placeholder]),
+ (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}"