Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
98f4fb67
Commit
98f4fb67
authored
May 20, 2024
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! NXD: Use merge description message as merge message by default
parent
cd08aa66
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
...merge_request_widget/components/states/ready_to_merge.vue
+3
-2
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
View file @
98f4fb67
...
@@ -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
.
defaultMergeCommitMessage
WithDescription
;
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
'
)
}}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment