domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Fix the Manually Merged form (#23015) (#23017)

Browse source 
Backport #23015

---------

Co-authored-by: Jason Song <i@wolfogre.com>
This commit is contained in:
wxiaoguang 2023-02-21 18:04:29 +08:00 • committed by GitHub
parent c50d4202ef
commit 7b3ffe5745
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web_src/js/components/PullRequestMergeForm.vue
View file

@ -28,6 +28,10 @@
</div>
</template>
<div class="field" v-if="mergeStyle === 'manually-merged'">
<input type="text" name="merge_commit_id" :placeholder="mergeForm.textMergeCommitId">
</div>
<button class="ui button" :class="mergeButtonStyleClass" type="submit" name="do" :value="mergeStyle">
{{ mergeStyleDetail.textDoMerge }}
<template v-if="autoMergeWhenSucceed">