Skip to content

Commit 29cbfe6

Browse files
committed
feat: add button to quickly clear merge message
1 parent 69fcca2 commit 29cbfe6

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

options/locale/locale_en-US.ini

+1
Original file line numberDiff line numberDiff line change
@@ -1618,6 +1618,7 @@ pulls.reopened_at = `reopened this pull request <a id="%[1]s" href="#%[1]s">%[2]
16181618
pulls.merge_instruction_hint = `You can also view <a class="show-instruction">command line instructions</a>.`
16191619
pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes.
16201620
pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea.
1621+
pulls.clear_merge_message = Clear merge message
16211622

16221623
pulls.auto_merge_button_when_succeed = (When checks succeed)
16231624
pulls.auto_merge_when_succeed = Auto merge when all checks succeed

templates/repo/issue/view_content/pull.tmpl

+2
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@
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}},
@@ -360,6 +361,7 @@
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}},

web_src/js/components/PullRequestMergeForm.vue

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
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>

0 commit comments

Comments
 (0)