add missing input for vue

go-gitea · Feb 21, 2023 · 5582faf · 5582faf
1 parent aec35fb
commit 5582faf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
@@ -321,6 +321,7 @@
  'textAutoMergeCancelSchedule': {{$.locale.Tr "repo.pulls.auto_merge_cancel_schedule"}},
  'textClearMergeMessage': {{$.locale.Tr "repo.pulls.clear_merge_message"}},
  'textClearMergeMessageHint': {{$.locale.Tr "repo.pulls.clear_merge_message_hint"}},
+ 'textMergeCommitId': {{$.locale.Tr "repo.pulls.merge_commit_id"}},
 
  'canMergeNow': {{$canMergeNow}},
  'allOverridableChecksOk': {{not $notAllOverridableChecksOk}},

diff --git 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">