選択できるのは25トピックまでです。 トピックは、先頭が英数字で、英数字とダッシュ('-')を使用した35文字以内のものにしてください。

pull.tmpl 28KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638
  1. {{if or .PullReviewers .OriginalReviews }}
  2. <div class="comment box">
  3. <div class="content">
  4. <div class="ui segment">
  5. <h4>{{$.i18n.Tr "repo.issues.review.reviewers"}}</h4>
  6. {{range .PullReviewers}}
  7. {{ $createdStr:= TimeSinceUnix .Review.UpdatedUnix $.Lang }}
  8. <div class="ui divider"></div>
  9. <div class="review-item">
  10. <div class="review-item-left">
  11. {{if .User}}
  12. <a href="{{.User.HomeLink}}">
  13. {{avatar .User}}
  14. </a>
  15. {{end}}
  16. <span>
  17. {{if .User}}
  18. <a href="{{.User.HomeLink}}">{{.User.GetDisplayName}}</a>
  19. {{else if .Team}}
  20. <span class="ui text">{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}</span>
  21. {{end}}
  22. {{if eq .Review.Type 1}}
  23. {{$.i18n.Tr "repo.issues.review.approve" $createdStr | Safe}}
  24. {{else if eq .Review.Type 2}}
  25. {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}}
  26. {{else if eq .Review.Type 3}}
  27. {{$.i18n.Tr "repo.issues.review.reject" $createdStr | Safe}}
  28. {{else if eq .Review.Type 4}}
  29. {{$.i18n.Tr "repo.issues.review.wait" $createdStr | Safe}}
  30. {{else}}
  31. {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}}
  32. {{end}}
  33. </span>
  34. </div>
  35. <div class="review-item-right">
  36. {{if .Review.Stale}}
  37. <span class="ui poping up type-icon text grey" data-content="{{$.i18n.Tr "repo.issues.is_stale"}}">
  38. {{svg "octicon-hourglass" 16 "icon"}}
  39. </span>
  40. {{end}}
  41. {{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed))}}
  42. <a href="#" class="ui muted poping up icon dismiss-review-btn" data-review-id="dismiss-review-{{.Review.ID}}" data-content="{{$.i18n.Tr "repo.issues.dismiss_review"}}">
  43. {{svg "octicon-x" 16}}
  44. </a>
  45. <div class="ui small modal" id="dismiss-review-modal">
  46. <div class="header">
  47. {{$.i18n.Tr "repo.issues.dismiss_review"}}
  48. </div>
  49. <div class="content">
  50. <div class="ui warning message text left">
  51. {{$.i18n.Tr "repo.issues.dismiss_review_warning"}}
  52. </div>
  53. <form class="ui form dismiss-review-form" id="dismiss-review-{{.Review.ID}}" action="{{$.RepoLink}}/issues/dismiss_review" method="post">
  54. {{$.CsrfTokenHtml}}
  55. <input type="hidden" name="review_id" value="{{.Review.ID}}">
  56. <div class="field">
  57. <label for="message">{{$.i18n.Tr "action.review_dismissed_reason"}}</label>
  58. <input id="message" name="message">
  59. </div>
  60. <div class="text right actions">
  61. <div class="ui cancel button">{{$.i18n.Tr "settings.cancel"}}</div>
  62. <button class="ui red button" type="submit">{{$.i18n.Tr "ok"}}</button>
  63. </div>
  64. </form>
  65. </div>
  66. </div>
  67. {{end}}
  68. <span class="type-icon text {{if eq .Review.Type 1}}green
  69. {{- else if eq .Review.Type 2}}grey
  70. {{- else if eq .Review.Type 3}}red
  71. {{- else if eq .Review.Type 4}}yellow
  72. {{else}}grey{{end}}">
  73. {{if .CanChange }}
  74. <a href="#" class="ui poping up icon re-request-review {{if .Checked}}checked{{end}}" data-issue-id="{{$.Issue.ID}}" data-content="{{if .Checked}} {{$.i18n.Tr "repo.issues.remove_request_review"}} {{else}} {{$.i18n.Tr "repo.issues.re_request_review"}} {{end}}" data-id="{{.ItemID}}" data-update-url="{{$.RepoLink}}/issues/request_review">
  75. {{if .Checked}} {{svg "octicon-trash"}} {{else}} {{svg "octicon-sync"}} {{end}}
  76. </a>
  77. {{end}}
  78. {{svg (printf "octicon-%s" .Review.Type.Icon)}}
  79. </span>
  80. </div>
  81. </div>
  82. {{end}}
  83. {{range .OriginalReviews}}
  84. {{ $createdStr:= TimeSinceUnix .UpdatedUnix $.Lang }}
  85. <div class="ui divider"></div>
  86. <div class="review-item">
  87. <div class="review-item-left">
  88. <a href="{{$.Repository.OriginalURL}}" class="ui poping up" data-content="{{$.i18n.Tr "repo.migrated_from_fake" $.Repository.GetOriginalURLHostname | Safe }}"><span class="text black "><i class="fa {{MigrationIcon $.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span></a>
  89. </div>
  90. <div class="review-item-right">
  91. <span class="type-icon text {{if eq .Type 1}}green
  92. {{- else if eq .Type 2}}grey
  93. {{- else if eq .Type 3}}red
  94. {{- else if eq .Type 4}}yellow
  95. {{else}}grey{{end}}">
  96. {{svg (printf "octicon-%s" .Type.Icon)}}
  97. </span>
  98. </div>
  99. </div>
  100. {{end}}
  101. </div>
  102. </div>
  103. </div>
  104. {{end}}
  105. <div class="timeline-item comment merge box">
  106. <a class="timeline-avatar text {{if .Issue.PullRequest.HasMerged}}purple
  107. {{- else if .Issue.IsClosed}}grey
  108. {{- else if .IsPullWorkInProgress}}grey
  109. {{- else if .IsFilesConflicted}}grey
  110. {{- else if .IsPullRequestBroken}}red
  111. {{- else if .IsBlockedByApprovals}}red
  112. {{- else if .IsBlockedByRejection}}red
  113. {{- else if .IsBlockedByOfficialReviewRequests}}red
  114. {{- else if .IsBlockedByOutdatedBranch}}red
  115. {{- else if .IsBlockedByChangedProtectedFiles}}red
  116. {{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsFailure .RequiredStatusCheckState.IsError)}}red
  117. {{- else if and .EnableStatusCheck (or (not $.LatestCommitStatus) .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}yellow
  118. {{- else if and .AllowMerge .RequireSigned (not .WillSign)}}red
  119. {{- else if .Issue.PullRequest.IsChecking}}yellow
  120. {{- else if .Issue.PullRequest.IsEmpty}}grey
  121. {{- else if .Issue.PullRequest.CanAutoMerge}}green
  122. {{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}</a>
  123. <div class="content">
  124. {{template "repo/pulls/status" .}}
  125. {{$canAutoMerge := false}}
  126. <div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}}">
  127. {{if .Issue.PullRequest.HasMerged}}
  128. <div class="item text">
  129. {{if .Issue.PullRequest.MergedCommitID}}
  130. {{$link := printf "%s/commit/%s" $.Repository.HTMLURL .Issue.PullRequest.MergedCommitID}}
  131. {{if eq $.Issue.PullRequest.Status 3}}
  132. {{$.i18n.Tr "repo.pulls.manually_merged_as" $link (ShortSha .Issue.PullRequest.MergedCommitID) | Safe}}
  133. {{else}}
  134. {{$.i18n.Tr "repo.pulls.merged_as" $link (ShortSha .Issue.PullRequest.MergedCommitID) | Safe}}
  135. {{end}}
  136. {{else}}
  137. {{$.i18n.Tr "repo.pulls.has_merged"}}
  138. {{end}}
  139. </div>
  140. {{if .IsPullBranchDeletable}}
  141. <div class="ui divider"></div>
  142. <div>
  143. <a class="delete-button ui red button" href="" data-url="{{.DeleteBranchLink}}">{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</a>
  144. </div>
  145. {{end}}
  146. {{else if .Issue.IsClosed}}
  147. <div class="item text">
  148. {{if .IsPullRequestBroken}}
  149. {{$.i18n.Tr "repo.pulls.cant_reopen_deleted_branch"}}
  150. {{else}}
  151. {{$.i18n.Tr "repo.pulls.reopen_to_merge"}}
  152. {{end}}
  153. </div>
  154. {{if and .IsPullBranchDeletable ( not .IsPullRequestBroken )}}
  155. <div class="ui divider"></div>
  156. <div>
  157. <a class="delete-button ui red button" href="" data-url="{{.DeleteBranchLink}}">{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</a>
  158. </div>
  159. {{end}}
  160. {{else if .IsPullFilesConflicted}}
  161. <div class="item text">
  162. {{svg "octicon-x"}}
  163. {{$.i18n.Tr "repo.pulls.files_conflicted"}}
  164. {{range .ConflictedFiles}}
  165. <div>{{.}}</div>
  166. {{end}}
  167. </div>
  168. {{else if .IsPullRequestBroken}}
  169. <div class="item">
  170. <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
  171. {{$.i18n.Tr "repo.pulls.data_broken"}}
  172. </div>
  173. {{else if .IsPullWorkInProgress}}
  174. <div class="item toggle-wip df ac sb" data-title="{{.Issue.Title}}" data-wip-prefix="{{(.WorkInProgressPrefix|Escape)}}" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/title">
  175. <div>
  176. <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
  177. {{$.i18n.Tr "repo.pulls.cannot_merge_work_in_progress" }}
  178. </div>
  179. <div>
  180. {{if or .HasIssuesOrPullsWritePermission .IsIssuePoster}}
  181. <button class="ui compact button">
  182. {{$.i18n.Tr "repo.pulls.remove_prefix" (.WorkInProgressPrefix|Escape) | Safe}}
  183. </button>
  184. {{end}}
  185. </div>
  186. </div>
  187. {{else if .Issue.PullRequest.IsChecking}}
  188. <div class="item">
  189. <i class="icon icon-octicon">{{svg "octicon-sync"}}</i>
  190. {{$.i18n.Tr "repo.pulls.is_checking"}}
  191. </div>
  192. {{else if .Issue.PullRequest.IsEmpty}}
  193. <div class="item">
  194. <i class="icon icon-octicon">{{svg "octicon-alert" 16}}</i>
  195. {{$.i18n.Tr "repo.pulls.is_empty"}}
  196. </div>
  197. {{else if .Issue.PullRequest.CanAutoMerge}}
  198. {{if .IsBlockedByApprovals}}
  199. <div class="item">
  200. <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
  201. {{$.i18n.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .Issue.PullRequest.ProtectedBranch.RequiredApprovals}}
  202. </div>
  203. {{else if .IsBlockedByRejection}}
  204. <div class="item">
  205. <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
  206. {{$.i18n.Tr "repo.pulls.blocked_by_rejection"}}
  207. </div>
  208. {{else if .IsBlockedByOfficialReviewRequests}}
  209. <div class="item">
  210. <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
  211. {{$.i18n.Tr "repo.pulls.blocked_by_official_review_requests"}}
  212. </div>
  213. {{else if .IsBlockedByOutdatedBranch}}
  214. <div class="item">
  215. <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
  216. {{$.i18n.Tr "repo.pulls.blocked_by_outdated_branch"}}
  217. </div>
  218. {{else if .IsBlockedByChangedProtectedFiles}}
  219. <div class="item">
  220. <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
  221. {{$.i18n.Tr (TrN $.i18n.Lang $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n") | Safe }}
  222. <div class="ui ordered list">
  223. {{range .ChangedProtectedFiles}}
  224. <div data-value="-" class="item">{{.}}</div>
  225. {{end}}
  226. </div>
  227. </div>
  228. {{else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsError .RequiredStatusCheckState.IsFailure)}}
  229. <div class="item">
  230. <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
  231. {{$.i18n.Tr "repo.pulls.required_status_check_failed"}}
  232. </div>
  233. {{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}}
  234. <div class="item">
  235. <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
  236. {{$.i18n.Tr "repo.pulls.required_status_check_missing"}}
  237. </div>
  238. {{else if and .AllowMerge .RequireSigned (not .WillSign)}}
  239. <div class="item">
  240. <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
  241. {{$.i18n.Tr "repo.pulls.require_signed_wont_sign"}}
  242. </div>
  243. <div class="item">
  244. <i class="icon unlock"></i>
  245. {{$.i18n.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }}
  246. </div>
  247. {{end}}
  248. {{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOfficialReviewRequests .IsBlockedByOutdatedBranch .IsBlockedByChangedProtectedFiles (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}}
  249. {{if and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}}
  250. {{if $notAllOverridableChecksOk}}
  251. <div class="item">
  252. <i class="icon icon-octicon">{{svg "octicon-dot-fill"}}</i>
  253. {{$.i18n.Tr "repo.pulls.required_status_check_administrator"}}
  254. </div>
  255. {{else}}
  256. <div class="item">
  257. <i class="icon icon-octicon">{{svg "octicon-check"}}</i>
  258. {{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}}
  259. </div>
  260. {{end}}
  261. {{if .WillSign}}
  262. <div class="item">
  263. <i class="icon lock green"></i>
  264. {{$.i18n.Tr "repo.signing.will_sign" .SigningKey}}
  265. </div>
  266. {{else if .IsSigned}}
  267. <div class="item">
  268. <i class="icon unlock"></i>
  269. {{$.i18n.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }}
  270. </div>
  271. {{end}}
  272. {{end}}
  273. {{$canAutoMerge = true}}
  274. {{if (gt .Issue.PullRequest.CommitsBehind 0)}}
  275. <div class="ui divider"></div>
  276. <div class="item item-section">
  277. <div class="item-section-left">
  278. <i class="icon icon-octicon">{{svg "octicon-alert"}}</i>
  279. {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}}
  280. </div>
  281. <div class="item-section-right">
  282. {{if and .UpdateAllowed .UpdateByRebaseAllowed }}
  283. <div class="dib">
  284. <div class="ui buttons update-button">
  285. <button class="ui button" data-do="{{.Link}}/update" data-redirect="{{.Link}}">
  286. <span class="button-text">
  287. {{$.i18n.Tr "repo.pulls.update_branch"}}
  288. </span>
  289. </button>
  290. <div class="ui dropdown icon button no-text">
  291. {{svg "octicon-triangle-down" 14 "dropdown icon"}}
  292. <div class="menu">
  293. <div class="item active selected" data-do="{{.Link}}/update">{{$.i18n.Tr "repo.pulls.update_branch"}}</div>
  294. <div class="item" data-do="{{.Link}}/update?style=rebase">{{$.i18n.Tr "repo.pulls.update_branch_rebase"}}</div>
  295. </div>
  296. </div>
  297. </div>
  298. </div>
  299. {{end}}
  300. {{if and .UpdateAllowed (not .UpdateByRebaseAllowed)}}
  301. <form action="{{.Link}}/update" method="post" class="ui update-branch-form">
  302. {{.CsrfTokenHtml}}
  303. <button class="ui compact button" data-do="update">
  304. <span class="ui text">{{$.i18n.Tr "repo.pulls.update_branch"}}</span>
  305. </button>
  306. </form>
  307. {{end}}
  308. </div>
  309. </div>
  310. {{end}}
  311. {{if and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}}
  312. {{if .AllowMerge}}
  313. {{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}}
  314. {{$approvers := .Issue.PullRequest.GetApprovers}}
  315. {{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash}}
  316. <div class="ui divider"></div>
  317. {{if $prUnit.PullRequestsConfig.AllowMerge}}
  318. <div class="ui form merge-fields" style="display: none">
  319. <form action="{{.Link}}/merge" method="post">
  320. {{.CsrfTokenHtml}}
  321. <div class="field">
  322. <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage}}">
  323. </div>
  324. <div class="field">
  325. <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
  326. </div>
  327. <button class="ui green button" type="submit" name="do" value="merge">
  328. {{$.i18n.Tr "repo.pulls.merge_pull_request"}}
  329. </button>
  330. <button class="ui button merge-cancel">
  331. {{$.i18n.Tr "cancel"}}
  332. </button>
  333. {{if .IsPullBranchDeletable}}
  334. <div class="ui checkbox ml-2">
  335. <input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
  336. <label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
  337. </div>
  338. {{end}}
  339. </form>
  340. </div>
  341. {{end}}
  342. {{if $prUnit.PullRequestsConfig.AllowRebase}}
  343. <div class="ui form rebase-fields" style="display: none">
  344. <form action="{{.Link}}/merge" method="post">
  345. {{.CsrfTokenHtml}}
  346. <button class="ui green button" type="submit" name="do" value="rebase">
  347. {{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
  348. </button>
  349. <button class="ui button merge-cancel">
  350. {{$.i18n.Tr "cancel"}}
  351. </button>
  352. {{if .IsPullBranchDeletable}}
  353. <div class="ui checkbox ml-2">
  354. <input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
  355. <label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
  356. </div>
  357. {{end}}
  358. </form>
  359. </div>
  360. {{end}}
  361. {{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
  362. <div class="ui form rebase-merge-fields" style="display: none">
  363. <form action="{{.Link}}/merge" method="post">
  364. {{.CsrfTokenHtml}}
  365. <div class="field">
  366. <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage}}">
  367. </div>
  368. <div class="field">
  369. <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
  370. </div>
  371. <button class="ui green button" type="submit" name="do" value="rebase-merge">
  372. {{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
  373. </button>
  374. <button class="ui button merge-cancel">
  375. {{$.i18n.Tr "cancel"}}
  376. </button>
  377. {{if .IsPullBranchDeletable}}
  378. <div class="ui checkbox ml-2">
  379. <input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
  380. <label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
  381. </div>
  382. {{end}}
  383. </form>
  384. </div>
  385. {{end}}
  386. {{if $prUnit.PullRequestsConfig.AllowSquash}}
  387. <div class="ui form squash-fields" style="display: none">
  388. <form action="{{.Link}}/merge" method="post">
  389. {{.CsrfTokenHtml}}
  390. <div class="field">
  391. <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultSquashMessage}}">
  392. </div>
  393. <div class="field">
  394. <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">{{.GetCommitMessages}}Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
  395. </div>
  396. <button class="ui green button" type="submit" name="do" value="squash">
  397. {{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
  398. </button>
  399. <button class="ui button merge-cancel">
  400. {{$.i18n.Tr "cancel"}}
  401. </button>
  402. {{if .IsPullBranchDeletable}}
  403. <div class="ui checkbox ml-2">
  404. <input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
  405. <label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
  406. </div>
  407. {{end}}
  408. </form>
  409. </div>
  410. {{end}}
  411. {{if and $prUnit.PullRequestsConfig.AllowManualMerge $.IsRepoAdmin}}
  412. <div class="ui form manually-merged-fields" style="display: none">
  413. <form action="{{.Link}}/merge" method="post">
  414. {{.CsrfTokenHtml}}
  415. <div class="field">
  416. <input type="text" name="merge_commit_id" placeholder="{{$.i18n.Tr "repo.pulls.merge_commit_id"}}">
  417. </div>
  418. <button class="ui red button" type="submit" name="do" value="manually-merged">
  419. {{$.i18n.Tr "repo.pulls.merge_manually"}}
  420. </button>
  421. <button class="ui button merge-cancel">
  422. {{$.i18n.Tr "cancel"}}
  423. </button>
  424. {{if .IsPullBranchDeletable}}
  425. <div class="ui checkbox ml-2">
  426. <input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
  427. <label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
  428. </div>
  429. {{end}}
  430. </form>
  431. </div>
  432. {{end}}
  433. <div class="dib">
  434. <div class="ui {{if $notAllOverridableChecksOk}}red{{else}}green{{end}} buttons merge-button">
  435. <button class="ui button" data-do="{{.MergeStyle}}">
  436. {{svg "octicon-git-merge"}}
  437. <span class="button-text">
  438. {{if eq .MergeStyle "merge"}}
  439. {{$.i18n.Tr "repo.pulls.merge_pull_request"}}
  440. {{end}}
  441. {{if eq .MergeStyle "rebase"}}
  442. {{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
  443. {{end}}
  444. {{if eq .MergeStyle "rebase-merge"}}
  445. {{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
  446. {{end}}
  447. {{if eq .MergeStyle "squash"}}
  448. {{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
  449. {{end}}
  450. {{if eq .MergeStyle "manually-merged"}}
  451. {{$.i18n.Tr "repo.pulls.merge_manually"}}
  452. {{end}}
  453. </span>
  454. </button>
  455. {{if gt $prUnit.PullRequestsConfig.AllowedMergeStyleCount 1}}
  456. <div class="ui dropdown icon button no-text">
  457. {{svg "octicon-triangle-down" 14 "dropdown icon"}}
  458. <div class="menu">
  459. {{if $prUnit.PullRequestsConfig.AllowMerge}}
  460. <div class="item{{if eq .MergeStyle "merge"}} active selected{{end}}" data-do="merge">{{$.i18n.Tr "repo.pulls.merge_pull_request"}}</div>
  461. {{end}}
  462. {{if $prUnit.PullRequestsConfig.AllowRebase}}
  463. <div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
  464. {{end}}
  465. {{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
  466. <div class="item{{if eq .MergeStyle "rebase-merge"}} active selected{{end}}" data-do="rebase-merge">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
  467. {{end}}
  468. {{if $prUnit.PullRequestsConfig.AllowSquash}}
  469. <div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}</div>
  470. {{end}}
  471. {{if and $prUnit.PullRequestsConfig.AllowManualMerge $.IsRepoAdmin}}
  472. <div class="item{{if eq .MergeStyle "manually-merged"}} active selected{{end}}" data-do="manually-merged">{{$.i18n.Tr "repo.pulls.merge_manually"}}</div>
  473. {{end}}
  474. </div>
  475. </div>
  476. {{end}}
  477. </div>
  478. </div>
  479. <div class="instruct-toggle ml-3"> {{$.i18n.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div>
  480. <div class="instruct-content" style="display:none">
  481. <div class="ui divider"></div>
  482. <div><h3 class="di">{{$.i18n.Tr "step1"}} </h3>{{$.i18n.Tr "repo.pulls.merge_instruction_step1_desc"}}</div>
  483. <div class="ui secondary segment">
  484. {{if eq .Issue.PullRequest.Flow 0}}
  485. <div>git checkout -b {{if ne .Issue.PullRequest.HeadRepo.ID .Issue.PullRequest.BaseRepo.ID}}{{.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{.Issue.PullRequest.HeadBranch}} {{.Issue.PullRequest.BaseBranch}}</div>
  486. <div>git pull {{if ne .Issue.PullRequest.HeadRepo.ID .Issue.PullRequest.BaseRepo.ID}}{{.Issue.PullRequest.HeadRepo.HTMLURL}}{{else}}origin{{end}} {{.Issue.PullRequest.HeadBranch}}</div>
  487. {{else}}
  488. <div>git fetch origin {{.Issue.PullRequest.GetGitRefName}}:{{.Issue.PullRequest.HeadBranch}}</div>
  489. {{end}}
  490. </div>
  491. <div><h3 class="di">{{$.i18n.Tr "step2"}} </h3>{{$.i18n.Tr "repo.pulls.merge_instruction_step2_desc"}}</div>
  492. <div class="ui secondary segment">
  493. <div>git checkout {{.Issue.PullRequest.BaseBranch}}</div>
  494. <div>git merge --no-ff {{if ne .Issue.PullRequest.HeadRepo.ID .Issue.PullRequest.BaseRepo.ID}}{{.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{.Issue.PullRequest.HeadBranch}}</div>
  495. <div>git push origin {{.Issue.PullRequest.BaseBranch}}</div>
  496. </div>
  497. </div>
  498. {{else}}
  499. <div class="ui divider"></div>
  500. <div class="item text red">
  501. {{svg "octicon-x"}}
  502. {{$.i18n.Tr "repo.pulls.no_merge_desc"}}
  503. </div>
  504. <div class="item">
  505. {{svg "octicon-info"}}
  506. {{$.i18n.Tr "repo.pulls.no_merge_helper"}}
  507. </div>
  508. {{end}}
  509. {{else}}
  510. <div class="ui divider"></div>
  511. <div class="item">
  512. {{svg "octicon-info"}}
  513. {{$.i18n.Tr "repo.pulls.no_merge_access"}}
  514. </div>
  515. {{end}}
  516. {{end}}
  517. {{else}}
  518. {{/* Merge conflict without specific file. Suggest manual merge, only if all reviews and status checks OK. */}}
  519. {{if .IsBlockedByApprovals}}
  520. <div class="item text red">
  521. {{svg "octicon-x"}}
  522. {{$.i18n.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .Issue.PullRequest.ProtectedBranch.RequiredApprovals}}
  523. </div>
  524. {{else if .IsBlockedByRejection}}
  525. <div class="item text red">
  526. {{svg "octicon-x"}}
  527. {{$.i18n.Tr "repo.pulls.blocked_by_rejection"}}
  528. </div>
  529. {{else if .IsBlockedByOfficialReviewRequests}}
  530. <div class="item text red">
  531. {{svg "octicon-x"}}
  532. {{$.i18n.Tr "repo.pulls.blocked_by_official_review_requests"}}
  533. </div>
  534. {{else if .IsBlockedByOutdatedBranch}}
  535. <div class="item text red">
  536. <i class="icon icon-octicon">{{svg "octicon-x"}}</i>
  537. {{$.i18n.Tr "repo.pulls.blocked_by_outdated_branch"}}
  538. </div>
  539. {{else if .IsBlockedByChangedProtectedFiles}}
  540. <div class="item text red">
  541. <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
  542. {{$.i18n.Tr (TrN $.i18n.Lang $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n") | Safe }}
  543. <div class="ui ordered list">
  544. {{range .ChangedProtectedFiles}}
  545. <div data-value="-" class="item">{{.}}</div>
  546. {{end}}
  547. </div>
  548. </div>
  549. {{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}}
  550. <div class="item text red">
  551. {{svg "octicon-x"}}
  552. {{$.i18n.Tr "repo.pulls.required_status_check_failed"}}
  553. </div>
  554. {{else if and .RequireSigned (not .WillSign)}}
  555. <div class="item text red">
  556. {{svg "octicon-x"}}
  557. {{$.i18n.Tr "repo.pulls.require_signed_wont_sign"}}
  558. </div>
  559. {{else}}
  560. <div class="item text red">
  561. {{svg "octicon-x"}}
  562. {{$.i18n.Tr "repo.pulls.cannot_auto_merge_desc"}}
  563. </div>
  564. <div class="item">
  565. {{svg "octicon-info"}}
  566. {{$.i18n.Tr "repo.pulls.cannot_auto_merge_helper"}}
  567. </div>
  568. {{end}}
  569. {{end}}
  570. {{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}}
  571. <div class="item df ac sb">
  572. <div>
  573. <i class="icon icon-octicon">{{svg "octicon-alert"}}</i>
  574. {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}}
  575. </div>
  576. <div>
  577. {{if and .UpdateAllowed .UpdateByRebaseAllowed }}
  578. <div class="dib">
  579. <div class="ui buttons update-button">
  580. <button class="ui button" data-do="{{.Link}}/update" data-redirect="{{.Link}}">
  581. <span class="button-text">
  582. {{$.i18n.Tr "repo.pulls.update_branch"}}
  583. </span>
  584. </button>
  585. <div class="ui dropdown icon button no-text">
  586. {{svg "octicon-triangle-down" 14 "dropdown icon"}}
  587. <div class="menu">
  588. <div class="item active selected" data-do="{{.Link}}/update">{{$.i18n.Tr "repo.pulls.update_branch"}}</div>
  589. <div class="item" data-do="{{.Link}}/update?style=rebase">{{$.i18n.Tr "repo.pulls.update_branch_rebase"}}</div>
  590. </div>
  591. </div>
  592. </div>
  593. </div>
  594. {{end}}
  595. {{if and .UpdateAllowed (not .UpdateByRebaseAllowed)}}
  596. <form action="{{.Link}}/update" method="post">
  597. {{.CsrfTokenHtml}}
  598. <button class="ui compact button" data-do="update">
  599. <span class="ui text">{{$.i18n.Tr "repo.pulls.update_branch"}}</span>
  600. </button>
  601. </form>
  602. {{end}}
  603. </div>
  604. </div>
  605. {{end}}
  606. {{if $.StillCanManualMerge}}
  607. <div class="ui divider"></div>
  608. <div class="ui form manually-merged-fields" style="display: none">
  609. <form action="{{.Link}}/merge" method="post">
  610. {{.CsrfTokenHtml}}
  611. <div class="field">
  612. <input type="text" name="merge_commit_id" placeholder="{{$.i18n.Tr "repo.pulls.merge_commit_id"}}">
  613. </div>
  614. <button class="ui red button" type="submit" name="do" value="manually-merged">
  615. {{$.i18n.Tr "repo.pulls.merge_manually"}}
  616. </button>
  617. <button class="ui button merge-cancel">
  618. {{$.i18n.Tr "cancel"}}
  619. </button>
  620. </form>
  621. </div>
  622. <div class="ui red buttons merge-button">
  623. <button class="ui button" data-do="manually-merged">
  624. {{$.i18n.Tr "repo.pulls.merge_manually"}}
  625. </button>
  626. </div>
  627. {{end}}
  628. </div>
  629. </div>
  630. </div>