Download as
Browse Code »

Commit 0de6e2da38058e4628d20cfb06433e873609a70f

Authored by Dmitriy Zaporozhets
1 parent 87814591
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Add UI for custom Merge request commit message 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 1 changed file with 15 additions and 1 deletions   Show diff stats
app/views/projects/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @0de6e2d
... ... @@ -13,7 +13,21 @@
13 13 If you still want to do it manually -
14 14 %strong
15 15 = link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
16   - for instructions
  16 + for instructions.
  17 +
  18 + %br
  19 + If you want to modify merge commit message -
  20 + %strong
  21 + = link_to "click here", "#", class: "js-toggle-visibility-link", title: "Modify merge commit message"
  22 +
  23 + .js-toggle-visibility-container.hide
  24 + .form-group
  25 + = label_tag :merge_commit_message, "Commit message", class: 'control-label'
  26 + .col-sm-10
  27 + = text_area_tag :merge_commit_message, @merge_request.merge_commit_message, class: "form-control js-gfm-input", rows: 14, required: true
  28 + %p.hint
  29 + The recommended maximum line length is 52 characters for the first line and 72 characters for all following lines.
  30 +
17 31 .accept-group
18 32 .pull-left
19 33 = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
... ...