diff options
Diffstat (limited to 'web_src/js/components/PullRequestMergeForm.vue')
| -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 2e10ce2531..bc960c1e70 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"> |