File tree 3 files changed +9
-0
lines changed
templates/repo/issue/view_content
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]
1618
1618
pulls.merge_instruction_hint = `You can also view <a class =" show-instruction" >command line instructions</a>.`
1619
1619
pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes.
1620
1620
pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea.
1621
+ pulls.clear_merge_message = Clear merge message
1621
1622
1622
1623
pulls.auto_merge_button_when_succeed = (When checks succeed)
1623
1624
pulls.auto_merge_when_succeed = Auto merge when all checks succeed
Original file line number Diff line number Diff line change 351
351
'textAutoMergeButtonWhenSucceed': {{$.locale.Tr "repo.pulls.auto_merge_button_when_succeed"}},
352
352
'textAutoMergeWhenSucceed': {{$.locale.Tr "repo.pulls.auto_merge_when_succeed"}},
353
353
'textAutoMergeCancelSchedule': {{$.locale.Tr "repo.pulls.auto_merge_cancel_schedule"}},
354
+ 'textClearMergeMessage': {{$.locale.Tr "repo.pulls.clear_merge_message"}},
354
355
355
356
'canMergeNow': {{$canMergeNow}},
356
357
'allOverridableChecksOk': {{not $notAllOverridableChecksOk}},
360
361
'defaultMergeStyle': {{.MergeStyle}},
361
362
'defaultDeleteBranchAfterMerge': {{$prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}},
362
363
'mergeMessageFieldPlaceHolder': {{$.locale.Tr "repo.editor.commit_message_desc"}},
364
+ 'defaultMergeMessage': defaultMergeMessage,
363
365
364
366
'hasPendingPullRequestMerge': {{.HasPendingPullRequestMerge}},
365
367
'hasPendingPullRequestMergeTip': {{$hasPendingPullRequestMergeTip}},
Original file line number Diff line number Diff line change 25
25
</div >
26
26
<div class =" field" >
27
27
<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 >
28
31
</div >
29
32
</template >
30
33
@@ -174,6 +177,9 @@ export default {
174
177
this .mergeStyle = name;
175
178
this .autoMergeWhenSucceed = autoMerge;
176
179
},
180
+ clearMergeMessage () {
181
+ this .mergeMessageFieldValue = this .mergeForm .defaultMergeMessage
182
+ },
177
183
},
178
184
};
179
185
< / script>
You can’t perform that action at this time.
0 commit comments