Commit 193b94c3 authored by Alain Takoudjou's avatar Alain Takoudjou

NXD: Use merge description message as merge message by default

Include Merge description message in merge by default. User can disable description in merge message by clicking on `Don't include description in commit message`.

Drop the merge title which is "Merge branch SOURCE into TARGET" and only keep the MR title as commit message.
parent 22cde15d
...@@ -962,7 +962,8 @@ class MergeRequest < ApplicationRecord ...@@ -962,7 +962,8 @@ class MergeRequest < ApplicationRecord
end end
message = [ message = [
"Merge branch '#{source_branch}' into '#{target_branch}'", # NXD: We only want to keep the original MR title
#"Merge branch '#{source_branch}' into '#{target_branch}'",
title title
] ]
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.commit-message-container .commit-message-container
.max-width-marker .max-width-marker
= text_area_tag 'commit_message', = text_area_tag 'commit_message',
(params[:commit_message] || local_assigns[:text] || local_assigns[:placeholder]), (local_assigns[:message_with_description] || params[:commit_message] || local_assigns[:text] || local_assigns[:placeholder]),
class: 'form-control js-commit-message', placeholder: local_assigns[:placeholder], class: 'form-control js-commit-message', placeholder: local_assigns[:placeholder],
data: descriptions, data: descriptions,
required: true, rows: (local_assigns[:rows] || 3), required: true, rows: (local_assigns[:rows] || 3),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment