diff options
author | wxiaoguang | 2023-02-21 18:03:41 +0800 |
---|---|---|
committer | GitHub | 2023-02-21 18:03:41 +0800 |
commit | e7b560f3fe07a0abf0321935d2a33d18a0f27acd (patch) | |
tree | 1078d3ec225f065a3fb336fa92cee96fbe21edf6 /web_src | |
parent | 7f790c70b9b178741e2ecbe971a6493b5eb423b2 (diff) |
Fix the Manually Merged form (#23015)
Regression bug of #19650
Close #20983
Close #21912
### The "Manually Merged" form
![image](https://user-images.githubusercontent.com/2114189/220170503-32638994-b509-4251-8aa1-d8393dda7184.png)
### Mark a PR as Manually Merged and close it
![image](https://user-images.githubusercontent.com/2114189/220170537-25c91b2c-7a9a-44d1-9e6a-ebe3f1dfc26a.png)
---------
Co-authored-by: Jason Song <i@wolfogre.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'web_src')
-rw-r--r-- | web_src/js/components/PullRequestMergeForm.vue | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue index 2e10ce253..bc960c1e7 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -36,6 +36,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"> |