Commit 98f4fb67 authored by Alain Takoudjou's avatar Alain Takoudjou

fixup! NXD: Use merge description message as merge message by default

parent cd08aa66
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
data.project.mergeRequest.shouldRemoveSourceBranch || data.project.mergeRequest.shouldRemoveSourceBranch ||
data.project.mergeRequest.forceRemoveSourceBranch || data.project.mergeRequest.forceRemoveSourceBranch ||
false; false;
this.commitMessage = data.project.mergeRequest.defaultMergeCommitMessage; this.commitMessage = data.project.mergeRequest.defaultMergeCommitMessageWithDescription;
this.squashBeforeMerge = data.project.mergeRequest.squashOnMerge; this.squashBeforeMerge = data.project.mergeRequest.squashOnMerge;
this.isSquashReadOnly = data.project.squashReadOnly; this.isSquashReadOnly = data.project.squashReadOnly;
this.squashCommitMessage = data.project.mergeRequest.defaultSquashCommitMessage; this.squashCommitMessage = data.project.mergeRequest.defaultSquashCommitMessage;
...@@ -536,7 +536,7 @@ export default { ...@@ -536,7 +536,7 @@ export default {
<gl-button <gl-button
size="medium" size="medium"
category="primary" category="primary"
class="accept-merge-request" class="patch-merge-request accept-merge-request"
data-testid="apply-button" data-testid="apply-button"
:variant="mergeButtonVariant" :variant="mergeButtonVariant"
:disabled="isApplyPatchAllowed" :disabled="isApplyPatchAllowed"
...@@ -652,6 +652,7 @@ export default { ...@@ -652,6 +652,7 @@ export default {
<input <input
id="include-description" id="include-description"
type="checkbox" type="checkbox"
checked
@change="updateMergeCommitMessage($event.target.checked)" @change="updateMergeCommitMessage($event.target.checked)"
/> />
{{ __('Include merge request description') }} {{ __('Include merge request description') }}
......
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