diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-13 12:29:28 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-13 12:29:28 +0300 |
| commit | 0401e19558b78aa16cd59ba384dd08dbb7634cba (patch) | |
| tree | 80d7529dd0ac96f73af78e68b904acf6aca5ae93 /app/views/projects/merge_requests/show | |
| parent | 0fd12a786af3d3fdc672b82ca76b7e0512efad7d (diff) | |
| parent | 07a9d44de7a54b2cd1bffd9fcc830f7b2a03b549 (diff) | |
| download | gitlab-ce-0401e19558b78aa16cd59ba384dd08dbb7634cba.tar.gz | |
Merge pull request #6385 from cirosantilli/72-char-commit-msg
Commit message textareas have 72 char mark line.
Diffstat (limited to 'app/views/projects/merge_requests/show')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 6ca801b17b9..1276489c2d9 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -21,7 +21,6 @@ = link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" for instructions. - .js-toggle-container %p If you want to modify merge commit message - @@ -31,7 +30,8 @@ .form-group = label_tag :merge_commit_message, "Commit message", class: 'control-label' .col-sm-10 - = text_area_tag :merge_commit_message, @merge_request.merge_commit_message, class: "form-control js-gfm-input", rows: 14, required: true + = render 'shared/commit_message_container', {textarea: text_area_tag(:merge_commit_message, + @merge_request.merge_commit_message, class: "form-control js-gfm-input", rows: 14, required: true)} %p.hint The recommended maximum line length is 52 characters for the first line and 72 characters for all following lines. |