You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

pull.tmpl 14KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345
  1. {{if gt (len .PullReviewers) 0}}
  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 .UpdatedUnix $.Lang }}
  8. <div class="ui divider"></div>
  9. <div class="review-item">
  10. <span class="type-icon text {{if eq .Type 1}}green
  11. {{- else if eq .Type 2}}grey
  12. {{- else if eq .Type 3}}red
  13. {{- else}}grey{{end}}">
  14. {{svg (printf "octicon-%s" .Type.Icon) 16}}
  15. </span>
  16. {{if .Stale}}
  17. <span class="type-icon text grey">
  18. <i class="octicon icon fa-hourglass-end"></i>
  19. </span>
  20. {{end}}
  21. <a class="ui avatar image" href="{{.Reviewer.HomeLink}}">
  22. <img src="{{.Reviewer.RelAvatarLink}}">
  23. </a>
  24. <span class="text grey"><a href="{{.Reviewer.HomeLink}}">{{.Reviewer.Name}}</a>
  25. {{if eq .Type 1}}
  26. {{$.i18n.Tr "repo.issues.review.approve" $createdStr | Safe}}
  27. {{else if eq .Type 2}}
  28. {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}}
  29. {{else if eq .Type 3}}
  30. {{$.i18n.Tr "repo.issues.review.reject" $createdStr | Safe}}
  31. {{else}}
  32. {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}}
  33. {{end}}
  34. </span>
  35. </div>
  36. {{end}}
  37. </div>
  38. </div>
  39. </div>
  40. {{end}}
  41. <div class="comment merge box">
  42. <a class="avatar text
  43. {{- if .Issue.PullRequest.HasMerged}}purple
  44. {{- else if .Issue.IsClosed}}grey
  45. {{- else if .IsPullWorkInProgress}}grey
  46. {{- else if .IsFilesConflicted}}grey
  47. {{- else if .IsPullRequestBroken}}red
  48. {{- else if .IsBlockedByApprovals}}red
  49. {{- else if .IsBlockedByRejection}}red
  50. {{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsFailure .RequiredStatusCheckState.IsError)}}red
  51. {{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}yellow
  52. {{- else if and .RequireSigned (not .WillSign)}}}red
  53. {{- else if .Issue.PullRequest.IsChecking}}yellow
  54. {{- else if .Issue.PullRequest.CanAutoMerge}}green
  55. {{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}</a>
  56. <div class="content">
  57. {{template "repo/pulls/status" .}}
  58. <div class="ui {{if not $.LatestCommitStatus}}top attached header{{else}}attached merge-section segment{{end}}">
  59. {{if .Issue.PullRequest.HasMerged}}
  60. <div class="item text purple">
  61. {{if .Issue.PullRequest.MergedCommitID}}
  62. {{$link := printf "%s/commit/%s" $.Repository.HTMLURL .Issue.PullRequest.MergedCommitID}}
  63. {{$.i18n.Tr "repo.pulls.merged_as" $link (ShortSha .Issue.PullRequest.MergedCommitID) | Safe}}
  64. {{else}}
  65. {{$.i18n.Tr "repo.pulls.has_merged"}}
  66. {{end}}
  67. </div>
  68. {{if .IsPullBranchDeletable}}
  69. <div class="ui divider"></div>
  70. <div>
  71. <a class="delete-button ui red button" href="" data-url="{{.DeleteBranchLink}}">{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</a>
  72. </div>
  73. {{end}}
  74. {{else if .Issue.IsClosed}}
  75. <div class="item text grey">
  76. {{if .IsPullRequestBroken}}
  77. {{$.i18n.Tr "repo.pulls.cant_reopen_deleted_branch"}}
  78. {{else}}
  79. {{$.i18n.Tr "repo.pulls.reopen_to_merge"}}
  80. {{end}}
  81. </div>
  82. {{if and .IsPullBranchDeletable ( not .IsPullRequestBroken )}}
  83. <div class="ui divider"></div>
  84. <div>
  85. <a class="delete-button ui red button" href="" data-url="{{.DeleteBranchLink}}">{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</a>
  86. </div>
  87. {{end}}
  88. {{else if .IsPullFilesConflicted}}
  89. <div class="item text grey">
  90. {{svg "octicon-x" 16}}
  91. {{$.i18n.Tr "repo.pulls.files_conflicted"}}
  92. {{range .ConflictedFiles}}
  93. <div>{{.}}</div>
  94. {{end}}
  95. </div>
  96. {{else if .IsPullRequestBroken}}
  97. <div class="item text red">
  98. <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
  99. {{$.i18n.Tr "repo.pulls.data_broken"}}
  100. </div>
  101. {{else if .IsPullWorkInProgress}}
  102. <div class="item text grey">
  103. <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
  104. {{$.i18n.Tr "repo.pulls.cannot_merge_work_in_progress" .WorkInProgressPrefix | Str2html}}
  105. </div>
  106. {{else if .Issue.PullRequest.IsChecking}}
  107. <div class="item text yellow">
  108. <i class="icon icon-octicon">{{svg "octicon-sync" 16}}</i>
  109. {{$.i18n.Tr "repo.pulls.is_checking"}}
  110. </div>
  111. {{else if .Issue.PullRequest.CanAutoMerge}}
  112. {{if .IsBlockedByApprovals}}
  113. <div class="item text red">
  114. <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
  115. {{$.i18n.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .Issue.PullRequest.ProtectedBranch.RequiredApprovals}}
  116. </div>
  117. {{else if .IsBlockedByRejection}}
  118. <div class="item text red">
  119. <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
  120. {{$.i18n.Tr "repo.pulls.blocked_by_rejection"}}
  121. </div>
  122. {{else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsError .RequiredStatusCheckState.IsFailure)}}
  123. <div class="item text red">
  124. <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
  125. {{$.i18n.Tr "repo.pulls.required_status_check_failed"}}
  126. </div>
  127. {{else if and .RequireSigned (not .WillSign)}}
  128. <div class="item text red">
  129. <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
  130. {{$.i18n.Tr "repo.pulls.require_signed_wont_sign"}}
  131. </div>
  132. <div class="item text yellow">
  133. <i class="icon unlock"></i>
  134. {{$.i18n.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }}
  135. </div>
  136. {{end}}
  137. {{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection (and .EnableStatusCheck (not .IsRequiredStatusCheckSuccess))}}
  138. {{if and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .RequireSigned) .WillSign)}}
  139. {{if $notAllOverridableChecksOk}}
  140. <div class="item text yellow">
  141. <i class="icon icon-octicon">{{svg "octicon-primitive-dot" 16}}</i>
  142. {{$.i18n.Tr "repo.pulls.required_status_check_administrator"}}
  143. </div>
  144. {{else}}
  145. <div class="item text green">
  146. <i class="icon icon-octicon">{{svg "octicon-check" 16}}</i>
  147. {{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}}
  148. </div>
  149. {{end}}
  150. {{if .WillSign}}
  151. <div class="item text green">
  152. <i class="icon lock green"></i>
  153. {{$.i18n.Tr "repo.signing.will_sign" .SigningKey}}
  154. </div>
  155. {{else if .IsSigned}}
  156. <div class="item text">
  157. <i class="icon unlock"></i>
  158. {{$.i18n.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }}
  159. </div>
  160. {{end}}
  161. {{if .AllowMerge}}
  162. {{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}}
  163. {{$approvers := .Issue.PullRequest.GetApprovers}}
  164. {{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash}}
  165. <div class="ui divider"></div>
  166. {{if $prUnit.PullRequestsConfig.AllowMerge}}
  167. <div class="ui form merge-fields" style="display: none">
  168. <form action="{{.Link}}/merge" method="post">
  169. {{.CsrfTokenHtml}}
  170. <div class="field">
  171. <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage}}">
  172. </div>
  173. <div class="field">
  174. <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
  175. </div>
  176. <button class="ui green button" type="submit" name="do" value="merge">
  177. {{$.i18n.Tr "repo.pulls.merge_pull_request"}}
  178. </button>
  179. <button class="ui button merge-cancel">
  180. {{$.i18n.Tr "cancel"}}
  181. </button>
  182. </form>
  183. </div>
  184. {{end}}
  185. {{if $prUnit.PullRequestsConfig.AllowRebase}}
  186. <div class="ui form rebase-fields" style="display: none">
  187. <form action="{{.Link}}/merge" method="post">
  188. {{.CsrfTokenHtml}}
  189. <button class="ui green button" type="submit" name="do" value="rebase">
  190. {{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
  191. </button>
  192. <button class="ui button merge-cancel">
  193. {{$.i18n.Tr "cancel"}}
  194. </button>
  195. </form>
  196. </div>
  197. {{end}}
  198. {{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
  199. <div class="ui form rebase-merge-fields" style="display: none">
  200. <form action="{{.Link}}/merge" method="post">
  201. {{.CsrfTokenHtml}}
  202. <div class="field">
  203. <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage}}">
  204. </div>
  205. <div class="field">
  206. <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
  207. </div>
  208. <button class="ui green button" type="submit" name="do" value="rebase-merge">
  209. {{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
  210. </button>
  211. <button class="ui button merge-cancel">
  212. {{$.i18n.Tr "cancel"}}
  213. </button>
  214. </form>
  215. </div>
  216. {{end}}
  217. {{if $prUnit.PullRequestsConfig.AllowSquash}}
  218. {{$commitMessages := .Issue.PullRequest.GetCommitMessages}}
  219. <div class="ui form squash-fields" style="display: none">
  220. <form action="{{.Link}}/merge" method="post">
  221. {{.CsrfTokenHtml}}
  222. <div class="field">
  223. <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultSquashMessage}}">
  224. </div>
  225. <div class="field">
  226. <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">{{$commitMessages}}Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
  227. </div>
  228. <button class="ui green button" type="submit" name="do" value="squash">
  229. {{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
  230. </button>
  231. <button class="ui button merge-cancel">
  232. {{$.i18n.Tr "cancel"}}
  233. </button>
  234. </form>
  235. </div>
  236. {{end}}
  237. <div class="ui {{if $notAllOverridableChecksOk}}red{{else}}green{{end}} buttons merge-button">
  238. <button class="ui button" data-do="{{.MergeStyle}}">
  239. {{svg "octicon-git-merge" 16}}
  240. <span class="button-text">
  241. {{if eq .MergeStyle "merge"}}
  242. {{$.i18n.Tr "repo.pulls.merge_pull_request"}}
  243. {{end}}
  244. {{if eq .MergeStyle "rebase"}}
  245. {{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
  246. {{end}}
  247. {{if eq .MergeStyle "rebase-merge"}}
  248. {{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
  249. {{end}}
  250. {{if eq .MergeStyle "squash"}}
  251. {{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
  252. {{end}}
  253. </span>
  254. </button>
  255. <div class="ui dropdown icon button">
  256. <i class="dropdown icon"></i>
  257. <div class="menu">
  258. {{if $prUnit.PullRequestsConfig.AllowMerge}}
  259. <div class="item{{if eq .MergeStyle "merge"}} active selected{{end}}" data-do="merge">{{$.i18n.Tr "repo.pulls.merge_pull_request"}}</div>
  260. {{end}}
  261. {{if $prUnit.PullRequestsConfig.AllowRebase}}
  262. <div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
  263. {{end}}
  264. {{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
  265. <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>
  266. {{end}}
  267. {{if $prUnit.PullRequestsConfig.AllowSquash}}
  268. <div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}</div>
  269. {{end}}
  270. </div>
  271. </div>
  272. </div>
  273. {{else}}
  274. <div class="item text red">
  275. {{svg "octicon-x" 16}}
  276. {{$.i18n.Tr "repo.pulls.no_merge_desc"}}
  277. </div>
  278. <div class="item text grey">
  279. {{svg "octicon-info" 16}}
  280. {{$.i18n.Tr "repo.pulls.no_merge_helper"}}
  281. </div>
  282. {{end}}
  283. {{else}}
  284. <div class="item text grey">
  285. {{svg "octicon-info" 16}}
  286. {{$.i18n.Tr "repo.pulls.no_merge_access"}}
  287. </div>
  288. {{end}}
  289. {{end}}
  290. {{if and .Divergence (gt .Divergence.Behind 0)}}
  291. <div class="ui very compact branch-update grid">
  292. <div class="row">
  293. <div class="item text gray eleven wide left floated column">
  294. <i class="icon icon-octicon">{{svg "octicon-alert" 16}}</i>
  295. {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}}
  296. </div>
  297. {{if .UpdateAllowed}}
  298. <div class="item text five wide right floated column">
  299. <form action="{{.Link}}/update" method="post">
  300. {{.CsrfTokenHtml}}
  301. <button class="ui button" data-do="update">
  302. <span class="item text">{{$.i18n.Tr "repo.pulls.update_branch"}}</span>
  303. </button>
  304. </form>
  305. </div>
  306. {{end}}
  307. </div>
  308. </div>
  309. {{end}}
  310. {{else}}
  311. {{/* Merge conflict without specific file. Suggest manual merge, only if all reviews and status checks OK. */}}
  312. {{if .IsBlockedByApprovals}}
  313. <div class="item text red">
  314. {{svg "octicon-x" 16}}
  315. {{$.i18n.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .Issue.PullRequest.ProtectedBranch.RequiredApprovals}}
  316. </div>
  317. {{else if .IsBlockedByRejection}}
  318. <div class="item text red">
  319. {{svg "octicon-x" 16}}
  320. {{$.i18n.Tr "repo.pulls.blocked_by_rejection"}}
  321. </div>
  322. {{else if and .EnableStatusCheck (not .IsRequiredStatusCheckSuccess)}}
  323. <div class="item text red">
  324. {{svg "octicon-x" 16}}
  325. {{$.i18n.Tr "repo.pulls.required_status_check_failed"}}
  326. </div>
  327. {{else if and .RequireSigned (not .WillSign)}}
  328. <div class="item text red">
  329. {{svg "octicon-x" 16}}
  330. {{$.i18n.Tr "repo.pulls.require_signed_wont_sign"}}
  331. </div>
  332. {{else}}
  333. <div class="item text red">
  334. {{svg "octicon-x" 16}}
  335. {{$.i18n.Tr "repo.pulls.cannot_auto_merge_desc"}}
  336. </div>
  337. <div class="item text grey">
  338. {{svg "octicon-info" 16}}
  339. {{$.i18n.Tr "repo.pulls.cannot_auto_merge_helper"}}
  340. </div>
  341. {{end}}
  342. {{end}}
  343. </div>
  344. </div>
  345. </div>