File tree Expand file tree Collapse file tree 3 files changed +9
-0
lines changed
templates/repo/issue/view_content Expand file tree Collapse file tree 3 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -1618,6 +1618,7 @@ pulls.reopened_at = `reopened this pull request <a id="%[1]s" href="#%[1]s">%[2]
16181618pulls.merge_instruction_hint = `You can also view <a class =" show-instruction" >command line instructions</a>.`
16191619pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes.
16201620pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea.
1621+ pulls.clear_merge_message = Clear merge message
16211622
16221623pulls.auto_merge_button_when_succeed = (When checks succeed)
16231624pulls.auto_merge_when_succeed = Auto merge when all checks succeed
Original file line number Diff line number Diff line change 351351 'textAutoMergeButtonWhenSucceed': {{$.locale.Tr "repo.pulls.auto_merge_button_when_succeed"}},
352352 'textAutoMergeWhenSucceed': {{$.locale.Tr "repo.pulls.auto_merge_when_succeed"}},
353353 'textAutoMergeCancelSchedule': {{$.locale.Tr "repo.pulls.auto_merge_cancel_schedule"}},
354+ 'textClearMergeMessage': {{$.locale.Tr "repo.pulls.clear_merge_message"}},
354355
355356 'canMergeNow': {{$canMergeNow}},
356357 'allOverridableChecksOk': {{not $notAllOverridableChecksOk}},
360361 'defaultMergeStyle': {{.MergeStyle}},
361362 'defaultDeleteBranchAfterMerge': {{$prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}},
362363 'mergeMessageFieldPlaceHolder': {{$.locale.Tr "repo.editor.commit_message_desc"}},
364+ 'defaultMergeMessage': defaultMergeMessage,
363365
364366 'hasPendingPullRequestMerge': {{.HasPendingPullRequestMerge}},
365367 'hasPendingPullRequestMergeTip': {{$hasPendingPullRequestMergeTip}},
Original file line number Diff line number Diff line change 2525 </div >
2626 <div class =" field" >
2727 <textarea name =" merge_message_field" rows =" 5" :placeholder =" mergeForm.mergeMessageFieldPlaceHolder" v-model =" mergeMessageFieldValue" />
28+ <button v-if =" mergeMessageFieldValue !== mergeForm.defaultMergeMessage" @click.prevent =" clearMergeMessage" class =" ui tertiary button" >
29+ {{ mergeForm.textClearMergeMessage }}
30+ </button >
2831 </div >
2932 </template >
3033
@@ -174,6 +177,9 @@ export default {
174177 this .mergeStyle = name;
175178 this .autoMergeWhenSucceed = autoMerge;
176179 },
180+ clearMergeMessage () {
181+ this .mergeMessageFieldValue = this .mergeForm .defaultMergeMessage
182+ },
177183 },
178184};
179185< / script>
You can’t perform that action at this time.
0 commit comments