Merge branch 'commit-message-prefilled' into 'master'

Prefills commit message in edit file See #14488 ![Screen_Shot_2016-04-06_at_10.18.06](/uploads/2ace2a21a6ead8d83c79ef9ce5dd34cc/Screen_Shot_2016-04-06_at_10.18.06.png) See merge request !3564

Merge branch 'commit-message-prefilled' into 'master'
2082879d · Jacob Schatz · 63265243 · 44a95c5d · 2082879d
Commit 2082879d authored Apr 12, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

_commit_message_container.html.haml app/views/shared/_commit_message_container.html.haml +1 -1

No files found.
--- 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}"