2020-10-14 07:11:11 -05:00
{{ if or .PullReviewers .OriginalReviews }}
2018-11-22 08:17:36 -05:00
<div class="comment box">
<div class="content">
<div class="ui segment">
<h4> {{ $ .i18n .Tr "repo.issues.review.reviewers" }} </h4>
2019-12-03 20:08:56 -05:00
{{ range .PullReviewers }}
2020-10-12 14:55:13 -05:00
{{ $ createdStr : = TimeSinceUnix .Review .UpdatedUnix $ .Lang }}
2018-11-22 08:17:36 -05:00
<div class="ui divider"></div>
<div class="review-item">
2020-06-15 02:37:00 -05:00
<div class="review-item-left">
2020-10-12 14:55:13 -05:00
{{ if .User }}
2020-12-03 13:46:11 -05:00
<a href=" {{ .User .HomeLink }} ">
{{ avatar .User }}
2020-10-12 14:55:13 -05:00
</a>
{{ end }}
<span class="text grey">
{{ if .User }}
2020-11-04 04:11:19 -05:00
<a href=" {{ .User .HomeLink }} "> {{ .User .GetDisplayName }} </a>
2020-10-12 14:55:13 -05:00
{{ else if .Team }}
<span class="ui text"> {{ $ .Issue .Repo .OwnerName }} / {{ .Team .Name }} </span>
{{ end }}
{{ if eq .Review .Type 1 }}
2020-06-15 02:37:00 -05:00
{{ $ .i18n .Tr "repo.issues.review.approve" $ createdStr | Safe }}
2020-10-12 14:55:13 -05:00
{{ else if eq .Review .Type 2 }}
2020-06-15 02:37:00 -05:00
{{ $ .i18n .Tr "repo.issues.review.comment" $ createdStr | Safe }}
2020-10-12 14:55:13 -05:00
{{ else if eq .Review .Type 3 }}
2020-06-15 02:37:00 -05:00
{{ $ .i18n .Tr "repo.issues.review.reject" $ createdStr | Safe }}
2020-10-12 14:55:13 -05:00
{{ else if eq .Review .Type 4 }}
2020-06-15 02:37:00 -05:00
{{ $ .i18n .Tr "repo.issues.review.wait" $ createdStr | Safe }}
{{ else }}
{{ $ .i18n .Tr "repo.issues.review.comment" $ createdStr | Safe }}
2020-04-06 11:33:34 -05:00
{{ end }}
2020-06-15 02:37:00 -05:00
</span>
</div>
<div class="review-item-right">
2020-10-12 14:55:13 -05:00
{{ if .Review .Stale }}
2020-09-04 11:36:37 -05:00
<span class="ui poping up type-icon text grey" data-content=" {{ $ .i18n .Tr "repo.issues.is_stale" }} ">
2020-06-15 02:37:00 -05:00
<i class="octicon icon fa-hourglass-end"></i>
</span>
2020-04-06 11:33:34 -05:00
{{ end }}
2020-10-12 14:55:13 -05:00
<span class="type-icon text {{ if eq .Review .Type 1 }} green
{{ - else if eq .Review .Type 2 }} grey
{{ - else if eq .Review .Type 3 }} red
{{ - else if eq .Review .Type 4 }} yellow
2020-06-15 02:37:00 -05:00
{{ else }} grey {{ end }} ">
2020-04-06 11:33:34 -05:00
2020-10-12 14:55:13 -05:00
{{ if .CanChange }}
<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">
2020-11-27 15:55:59 -05:00
{{ if .Checked }} {{ svg "octicon-trashcan" }} {{ else }} {{ svg "octicon-sync" }} {{ end }}
2020-06-15 02:37:00 -05:00
</a>
{{ end }}
2020-10-12 14:55:13 -05:00
{{ svg ( printf "octicon-%s" .Review .Type .Icon ) }}
2020-06-15 02:37:00 -05:00
</span>
</div>
2018-11-22 08:17:36 -05:00
</div>
{{ end }}
2020-10-14 07:11:11 -05:00
{{ range .OriginalReviews }}
{{ $ createdStr : = TimeSinceUnix .UpdatedUnix $ .Lang }}
<div class="ui divider"></div>
<div class="review-item">
<div class="review-item-left">
<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>
</div>
<div class="review-item-right">
<span class="type-icon text {{ if eq .Type 1 }} green
{{ - else if eq .Type 2 }} grey
{{ - else if eq .Type 3 }} red
{{ - else if eq .Type 4 }} yellow
{{ else }} grey {{ end }} ">
{{ svg ( printf "octicon-%s" .Type .Icon ) }}
</span>
</div>
</div>
{{ end }}
2018-11-22 08:17:36 -05:00
</div>
</div>
</div>
{{ end }}
2020-04-10 17:01:41 -05:00
<div class="timeline-item comment merge box">
<a class="timeline-avatar text {{ if .Issue .PullRequest .HasMerged }} purple
2020-04-03 00:12:42 -05:00
{{ - else if .Issue .IsClosed }} grey
{{ - else if .IsPullWorkInProgress }} grey
{{ - else if .IsFilesConflicted }} grey
{{ - else if .IsPullRequestBroken }} red
{{ - else if .IsBlockedByApprovals }} red
{{ - else if .IsBlockedByRejection }} red
2020-11-28 14:30:46 -05:00
{{ - else if .IsBlockedByOfficialReviewRequests }} red
2020-04-16 20:00:36 -05:00
{{ - else if .IsBlockedByOutdatedBranch }} red
2020-10-13 13:50:57 -05:00
{{ - else if .IsBlockedByChangedProtectedFiles }} red
2020-04-03 00:12:42 -05:00
{{ - else if and .EnableStatusCheck ( or .RequiredStatusCheckState .IsFailure .RequiredStatusCheckState .IsError ) }} red
2020-04-15 15:35:18 -05:00
{{ - else if and .EnableStatusCheck ( or ( not $ .LatestCommitStatus ) .RequiredStatusCheckState .IsPending .RequiredStatusCheckState .IsWarning ) }} yellow
2020-08-23 16:59:41 -05:00
{{ - else if and .AllowMerge .RequireSigned ( not .WillSign ) }} red
2020-04-03 00:12:42 -05:00
{{ - else if .Issue .PullRequest .IsChecking }} yellow
{{ - else if .Issue .PullRequest .CanAutoMerge }} green
{{ - else }} red {{ end }} "> {{ svg "octicon-git-merge" 3 2 }} </a>
2017-03-17 00:57:43 -05:00
<div class="content">
2019-06-30 02:57:59 -05:00
{{ template "repo/pulls/status" . }}
2020-06-13 13:49:59 -05:00
{{ $ canAutoMerge : = false }}
2020-05-25 14:08:06 -05:00
<div class="ui attached merge-section segment {{ if not $ .LatestCommitStatus }} no-header {{ end }} ">
2017-03-17 00:57:43 -05:00
{{ if .Issue .PullRequest .HasMerged }}
2020-11-15 15:58:16 -05:00
<div class="item text">
2019-09-03 01:29:36 -05:00
{{ if .Issue .PullRequest .MergedCommitID }}
{{ $ link : = printf "%s/commit/%s" $ .Repository .HTMLURL .Issue .PullRequest .MergedCommitID }}
{{ $ .i18n .Tr "repo.pulls.merged_as" $ link ( ShortSha .Issue .PullRequest .MergedCommitID ) | Safe }}
{{ else }}
{{ $ .i18n .Tr "repo.pulls.has_merged" }}
{{ end }}
2017-03-17 00:57:43 -05:00
</div>
{{ if .IsPullBranchDeletable }}
<div class="ui divider"></div>
<div>
<a class="delete-button ui red button" href="" data-url=" {{ .DeleteBranchLink }} "> {{ $ .i18n .Tr "repo.branch.delete" .HeadTarget }} </a>
</div>
{{ end }}
{{ else if .Issue .IsClosed }}
2020-11-15 15:58:16 -05:00
<div class="item text">
2019-04-20 15:50:34 -05:00
{{ if .IsPullRequestBroken }}
{{ $ .i18n .Tr "repo.pulls.cant_reopen_deleted_branch" }}
{{ else }}
{{ $ .i18n .Tr "repo.pulls.reopen_to_merge" }}
{{ end }}
2017-03-17 00:57:43 -05:00
</div>
2020-01-07 12:06:14 -05:00
{{ if and .IsPullBranchDeletable ( not .IsPullRequestBroken ) }}
2019-04-20 15:50:34 -05:00
<div class="ui divider"></div>
<div>
<a class="delete-button ui red button" href="" data-url=" {{ .DeleteBranchLink }} "> {{ $ .i18n .Tr "repo.branch.delete" .HeadTarget }} </a>
</div>
{{ end }}
2019-02-05 06:54:49 -05:00
{{ else if .IsPullFilesConflicted }}
2020-11-15 15:58:16 -05:00
<div class="item text">
2020-09-11 15:19:00 -05:00
{{ svg "octicon-x" }}
2019-02-05 06:54:49 -05:00
{{ $ .i18n .Tr "repo.pulls.files_conflicted" }}
{{ range .ConflictedFiles }}
<div> {{ . }} </div>
{{ end }}
</div>
2018-07-31 22:00:35 -05:00
{{ else if .IsPullRequestBroken }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
2017-03-17 00:57:43 -05:00
{{ $ .i18n .Tr "repo.pulls.data_broken" }}
</div>
2018-08-13 14:04:39 -05:00
{{ else if .IsPullWorkInProgress }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
2020-08-27 23:37:05 -05:00
{{ $ .i18n .Tr "repo.pulls.cannot_merge_work_in_progress" ( .WorkInProgressPrefix | Escape ) | Str2html }}
2018-08-13 14:04:39 -05:00
</div>
2017-03-17 00:57:43 -05:00
{{ else if .Issue .PullRequest .IsChecking }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-sync" }} </i>
2017-03-17 00:57:43 -05:00
{{ $ .i18n .Tr "repo.pulls.is_checking" }}
</div>
{{ else if .Issue .PullRequest .CanAutoMerge }}
2020-01-11 02:29:34 -05:00
{{ if .IsBlockedByApprovals }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
2020-01-11 02:29:34 -05:00
{{ $ .i18n .Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .Issue .PullRequest .ProtectedBranch .RequiredApprovals }}
</div>
{{ else if .IsBlockedByRejection }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
2020-01-11 02:29:34 -05:00
{{ $ .i18n .Tr "repo.pulls.blocked_by_rejection" }}
</div>
2020-11-28 14:30:46 -05:00
{{ else if .IsBlockedByOfficialReviewRequests }}
<div class="item">
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
{{ $ .i18n .Tr "repo.pulls.blocked_by_official_review_requests" }}
</div>
2020-04-16 20:00:36 -05:00
{{ else if .IsBlockedByOutdatedBranch }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
2020-04-16 20:00:36 -05:00
{{ $ .i18n .Tr "repo.pulls.blocked_by_outdated_branch" }}
</div>
2020-10-13 13:50:57 -05:00
{{ else if .IsBlockedByChangedProtectedFiles }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-10-13 13:50:57 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-x" 1 6 }} </i>
{{ $ .i18n .Tr ( TrN $ .i18n .Lang $ .ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n" ) | Safe }}
<div class="ui ordered list">
{{ range .ChangedProtectedFiles }}
<div data-value="-" class="item"> {{ . }} </div>
{{ end }}
</div>
</div>
2020-01-21 22:46:04 -05:00
{{ else if and .EnableStatusCheck ( or .RequiredStatusCheckState .IsError .RequiredStatusCheckState .IsFailure ) }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
2020-01-11 02:29:34 -05:00
{{ $ .i18n .Tr "repo.pulls.required_status_check_failed" }}
</div>
2020-04-15 15:35:18 -05:00
{{ else if and .EnableStatusCheck ( not .RequiredStatusCheckState .IsSuccess ) }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
2020-04-15 15:35:18 -05:00
{{ $ .i18n .Tr "repo.pulls.required_status_check_missing" }}
</div>
2020-08-23 16:59:41 -05:00
{{ else if and .AllowMerge .RequireSigned ( not .WillSign ) }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
2020-01-15 03:32:57 -05:00
{{ $ .i18n .Tr "repo.pulls.require_signed_wont_sign" }}
</div>
2020-11-15 15:58:16 -05:00
<div class="item">
2020-01-18 06:30:35 -05:00
<i class="icon unlock"></i>
2020-01-15 03:32:57 -05:00
{{ $ .i18n .Tr ( printf "repo.signing.wont_sign.%s" .WontSignReason ) }}
</div>
2019-09-18 00:39:45 -05:00
{{ end }}
2020-11-28 14:30:46 -05:00
{{ $ notAllOverridableChecksOk : = or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOfficialReviewRequests .IsBlockedByOutdatedBranch .IsBlockedByChangedProtectedFiles ( and .EnableStatusCheck ( not .RequiredStatusCheckState .IsSuccess ) ) }}
2020-08-23 16:59:41 -05:00
{{ if and ( or $ .IsRepoAdmin ( not $ notAllOverridableChecksOk ) ) ( or ( not .AllowMerge ) ( not .RequireSigned ) .WillSign ) }}
2020-01-16 16:01:22 -05:00
{{ if $ notAllOverridableChecksOk }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-dot-fill" }} </i>
2019-09-18 00:39:45 -05:00
{{ $ .i18n .Tr "repo.pulls.required_status_check_administrator" }}
2018-12-27 05:27:08 -05:00
</div>
2019-09-18 00:39:45 -05:00
{{ else }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-check" }} </i>
2019-09-18 00:39:45 -05:00
{{ $ .i18n .Tr "repo.pulls.can_auto_merge_desc" }}
2018-01-05 13:56:50 -05:00
</div>
2019-09-18 00:39:45 -05:00
{{ end }}
2020-01-15 03:32:57 -05:00
{{ if .WillSign }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-01-15 03:32:57 -05:00
<i class="icon lock green"></i>
{{ $ .i18n .Tr "repo.signing.will_sign" .SigningKey }}
</div>
2020-01-15 17:55:25 -05:00
{{ else if .IsSigned }}
2020-11-15 15:58:16 -05:00
<div class="item">
2020-01-18 06:30:35 -05:00
<i class="icon unlock"></i>
2020-01-15 03:32:57 -05:00
{{ $ .i18n .Tr ( printf "repo.signing.wont_sign.%s" .WontSignReason ) }}
</div>
{{ end }}
2020-06-13 13:49:59 -05:00
{{ end }}
2020-06-17 20:20:07 -05:00
2020-06-13 13:49:59 -05:00
{{ $ canAutoMerge = true }}
{{ if ( gt .Issue .PullRequest .CommitsBehind 0 ) }}
<div class="ui divider"></div>
2020-11-15 15:58:16 -05:00
<div class="item item-section">
2020-06-13 13:49:59 -05:00
<div class="item-section-left">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-alert" }} </i>
2020-06-13 13:49:59 -05:00
{{ $ .i18n .Tr "repo.pulls.outdated_with_base_branch" }}
</div>
<div class="item-section-right">
{{ if .UpdateAllowed }}
<form action=" {{ .Link }} /update" method="post" class="ui update-branch-form">
{{ .CsrfTokenHtml }}
<button class="ui compact button" data-do="update">
<span class="ui text"> {{ $ .i18n .Tr "repo.pulls.update_branch" }} </span>
</button>
</form>
{{ end }}
</div>
</div>
{{ end }}
2020-08-23 16:59:41 -05:00
{{ if and ( or $ .IsRepoAdmin ( not $ notAllOverridableChecksOk ) ) ( or ( not .AllowMerge ) ( not .RequireSigned ) .WillSign ) }}
2019-09-18 00:39:45 -05:00
{{ if .AllowMerge }}
{{ $ prUnit : = .Repository .MustGetUnit $ .UnitTypePullRequests }}
2019-12-30 18:34:11 -05:00
{{ $ approvers : = .Issue .PullRequest .GetApprovers }}
2019-09-18 00:39:45 -05:00
{{ if or $ prUnit .PullRequestsConfig .AllowMerge $ prUnit .PullRequestsConfig .AllowRebase $ prUnit .PullRequestsConfig .AllowRebaseMerge $ prUnit .PullRequestsConfig .AllowSquash }}
<div class="ui divider"></div>
{{ if $ prUnit .PullRequestsConfig .AllowMerge }}
<div class="ui form merge-fields" style="display: none">
<form action=" {{ .Link }} /merge" method="post">
{{ .CsrfTokenHtml }}
<div class="field">
<input type="text" name="merge_title_field" value=" {{ .Issue .PullRequest .GetDefaultMergeMessage }} ">
</div>
<div class="field">
2020-01-09 09:31:09 -05:00
<textarea name="merge_message_field" rows="5" placeholder=" {{ $ .i18n .Tr "repo.editor.commit_message_desc" }} ">Reviewed-on: {{ $ .Issue .HTMLURL }} {{ $ approvers }} </textarea>
2019-09-18 00:39:45 -05:00
</div>
<button class="ui green button" type="submit" name="do" value="merge">
{{ $ .i18n .Tr "repo.pulls.merge_pull_request" }}
</button>
<button class="ui button merge-cancel">
{{ $ .i18n .Tr "cancel" }}
</button>
</form>
</div>
{{ end }}
{{ if $ prUnit .PullRequestsConfig .AllowRebase }}
<div class="ui form rebase-fields" style="display: none">
<form action=" {{ .Link }} /merge" method="post">
{{ .CsrfTokenHtml }}
<button class="ui green button" type="submit" name="do" value="rebase">
{{ $ .i18n .Tr "repo.pulls.rebase_merge_pull_request" }}
</button>
<button class="ui button merge-cancel">
{{ $ .i18n .Tr "cancel" }}
</button>
</form>
</div>
{{ end }}
{{ if $ prUnit .PullRequestsConfig .AllowRebaseMerge }}
<div class="ui form rebase-merge-fields" style="display: none">
<form action=" {{ .Link }} /merge" method="post">
{{ .CsrfTokenHtml }}
<div class="field">
<input type="text" name="merge_title_field" value=" {{ .Issue .PullRequest .GetDefaultMergeMessage }} ">
</div>
<div class="field">
2020-01-09 09:31:09 -05:00
<textarea name="merge_message_field" rows="5" placeholder=" {{ $ .i18n .Tr "repo.editor.commit_message_desc" }} ">Reviewed-on: {{ $ .Issue .HTMLURL }} {{ $ approvers }} </textarea>
2019-09-18 00:39:45 -05:00
</div>
<button class="ui green button" type="submit" name="do" value="rebase-merge">
{{ $ .i18n .Tr "repo.pulls.rebase_merge_commit_pull_request" }}
</button>
<button class="ui button merge-cancel">
{{ $ .i18n .Tr "cancel" }}
</button>
</form>
</div>
{{ end }}
{{ if $ prUnit .PullRequestsConfig .AllowSquash }}
<div class="ui form squash-fields" style="display: none">
<form action=" {{ .Link }} /merge" method="post">
{{ .CsrfTokenHtml }}
<div class="field">
<input type="text" name="merge_title_field" value=" {{ .Issue .PullRequest .GetDefaultSquashMessage }} ">
</div>
<div class="field">
2020-04-10 06:26:37 -05:00
<textarea name="merge_message_field" rows="5" placeholder=" {{ $ .i18n .Tr "repo.editor.commit_message_desc" }} "> {{ .GetCommitMessages }} Reviewed-on: {{ $ .Issue .HTMLURL }} {{ $ approvers }} </textarea>
2019-09-18 00:39:45 -05:00
</div>
<button class="ui green button" type="submit" name="do" value="squash">
{{ $ .i18n .Tr "repo.pulls.squash_merge_pull_request" }}
</button>
<button class="ui button merge-cancel">
{{ $ .i18n .Tr "cancel" }}
</button>
</form>
</div>
{{ end }}
2020-12-09 21:59:05 -05:00
<div class="dib">
<div class="ui {{ if $ notAllOverridableChecksOk }} red {{ else }} green {{ end }} buttons merge-button">
<button class="ui button" data-do=" {{ .MergeStyle }} ">
{{ svg "octicon-git-merge" }}
<span class="button-text">
{{ if eq .MergeStyle "merge" }}
{{ $ .i18n .Tr "repo.pulls.merge_pull_request" }}
{{ end }}
{{ if eq .MergeStyle "rebase" }}
{{ $ .i18n .Tr "repo.pulls.rebase_merge_pull_request" }}
{{ end }}
{{ if eq .MergeStyle "rebase-merge" }}
{{ $ .i18n .Tr "repo.pulls.rebase_merge_commit_pull_request" }}
{{ end }}
{{ if eq .MergeStyle "squash" }}
{{ $ .i18n .Tr "repo.pulls.squash_merge_pull_request" }}
{{ end }}
</span>
</button>
{{ if gt $ prUnit .PullRequestsConfig .AllowedMergeStyleCount 1 }}
2020-12-18 22:57:25 -05:00
<div class="ui dropdown icon button no-text">
2020-12-09 21:59:05 -05:00
{{ svg "octicon-triangle-down" 1 4 "dropdown icon" }}
<div class="menu">
{{ if $ prUnit .PullRequestsConfig .AllowMerge }}
<div class="item {{ if eq .MergeStyle "merge" }} active selected {{ end }} " data-do="merge"> {{ $ .i18n .Tr "repo.pulls.merge_pull_request" }} </div>
{{ end }}
{{ if $ prUnit .PullRequestsConfig .AllowRebase }}
<div class="item {{ if eq .MergeStyle "rebase" }} active selected {{ end }} " data-do="rebase"> {{ $ .i18n .Tr "repo.pulls.rebase_merge_pull_request" }} </div>
{{ end }}
{{ if $ prUnit .PullRequestsConfig .AllowRebaseMerge }}
<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>
{{ end }}
{{ if $ prUnit .PullRequestsConfig .AllowSquash }}
<div class="item {{ if eq .MergeStyle "squash" }} active selected {{ end }} " data-do="squash"> {{ $ .i18n .Tr "repo.pulls.squash_merge_pull_request" }} </div>
{{ end }}
</div>
2020-11-22 08:58:12 -05:00
</div>
2020-12-09 21:59:05 -05:00
{{ end }}
</div>
</div>
2020-12-15 01:09:24 -05:00
<div class="instruct-toggle ml-3"> {{ $ .i18n .Tr "repo.pulls.merge_instruction_hint" | Safe }} </div>
<div class="instruct-content" style="display:none">
2020-12-09 21:59:05 -05:00
<div class="ui divider"></div>
<div><h3 class="di"> {{ $ .i18n .Tr "step1" }} </h3> {{ $ .i18n .Tr "repo.pulls.merge_instruction_step1_desc" }} </div>
<div class="ui secondary segment">
<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>
<div>git pull {{ if ne .Issue .PullRequest .HeadRepo .ID .Issue .PullRequest .BaseRepo .ID }} {{ .Issue .PullRequest .HeadRepo .HTMLURL }} {{ else }} origin {{ end }} {{ .Issue .PullRequest .HeadBranch }} </div>
</div>
<div><h3 class="di"> {{ $ .i18n .Tr "step2" }} </h3> {{ $ .i18n .Tr "repo.pulls.merge_instruction_step2_desc" }} </div>
<div class="ui secondary segment">
<div>git checkout {{ .Issue .PullRequest .BaseBranch }} </div>
<div>git merge --no-ff {{ if ne .Issue .PullRequest .HeadRepo .ID .Issue .PullRequest .BaseRepo .ID }} {{ .Issue .PullRequest .HeadRepo .OwnerName }} - {{ end }} {{ .Issue .PullRequest .HeadBranch }} </div>
<div>git push origin {{ .Issue .PullRequest .BaseBranch }} </div>
</div>
2018-01-05 13:56:50 -05:00
</div>
2019-09-18 00:39:45 -05:00
{{ else }}
2020-06-13 13:49:59 -05:00
<div class="ui divider"></div>
2019-09-18 00:39:45 -05:00
<div class="item text red">
2020-09-11 15:19:00 -05:00
{{ svg "octicon-x" }}
2019-09-18 00:39:45 -05:00
{{ $ .i18n .Tr "repo.pulls.no_merge_desc" }}
</div>
<div class="item text grey">
2020-09-11 15:19:00 -05:00
{{ svg "octicon-info" }}
2019-09-18 00:39:45 -05:00
{{ $ .i18n .Tr "repo.pulls.no_merge_helper" }}
</div>
{{ end }}
2020-01-11 02:29:34 -05:00
{{ else }}
2020-06-13 13:49:59 -05:00
<div class="ui divider"></div>
2020-01-11 02:29:34 -05:00
<div class="item text grey">
2020-09-11 15:19:00 -05:00
{{ svg "octicon-info" }}
2020-01-11 02:29:34 -05:00
{{ $ .i18n .Tr "repo.pulls.no_merge_access" }}
</div>
2018-01-05 13:56:50 -05:00
{{ end }}
2017-03-17 00:57:43 -05:00
{{ end }}
{{ else }}
2020-01-11 02:29:34 -05:00
{{ / * Merge conflict with out specific file . Suggest manual merge , only if all reviews and status checks OK . * / }}
{{ if .IsBlockedByApprovals }}
<div class="item text red">
2020-09-11 15:19:00 -05:00
{{ svg "octicon-x" }}
2020-01-11 02:29:34 -05:00
{{ $ .i18n .Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .Issue .PullRequest .ProtectedBranch .RequiredApprovals }}
</div>
{{ else if .IsBlockedByRejection }}
<div class="item text red">
2020-09-11 15:19:00 -05:00
{{ svg "octicon-x" }}
2020-11-28 14:30:46 -05:00
{{ $ .i18n .Tr "repo.pulls.blocked_by_rejection" }}
</div>
{{ else if .IsBlockedByOfficialReviewRequests }}
<div class="item text red">
{{ svg "octicon-x" }}
{{ $ .i18n .Tr "repo.pulls.blocked_by_official_review_requests" }}
2020-01-11 02:29:34 -05:00
</div>
2020-04-16 20:00:36 -05:00
{{ else if .IsBlockedByOutdatedBranch }}
<div class="item text red">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
2020-04-16 20:00:36 -05:00
{{ $ .i18n .Tr "repo.pulls.blocked_by_outdated_branch" }}
</div>
2020-10-13 13:50:57 -05:00
{{ else if .IsBlockedByChangedProtectedFiles }}
<div class="item text red">
<i class="icon icon-octicon"> {{ svg "octicon-x" 1 6 }} </i>
{{ $ .i18n .Tr ( TrN $ .i18n .Lang $ .ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n" ) | Safe }}
<div class="ui ordered list">
{{ range .ChangedProtectedFiles }}
<div data-value="-" class="item"> {{ . }} </div>
{{ end }}
</div>
</div>
2020-04-15 15:35:18 -05:00
{{ else if and .EnableStatusCheck ( not .RequiredStatusCheckState .IsSuccess ) }}
2020-01-11 02:29:34 -05:00
<div class="item text red">
2020-09-11 15:19:00 -05:00
{{ svg "octicon-x" }}
2020-01-11 02:29:34 -05:00
{{ $ .i18n .Tr "repo.pulls.required_status_check_failed" }}
</div>
2020-01-15 03:32:57 -05:00
{{ else if and .RequireSigned ( not .WillSign ) }}
<div class="item text red">
2020-09-11 15:19:00 -05:00
{{ svg "octicon-x" }}
2020-01-15 03:32:57 -05:00
{{ $ .i18n .Tr "repo.pulls.require_signed_wont_sign" }}
</div>
2020-01-11 02:29:34 -05:00
{{ else }}
<div class="item text red">
2020-09-11 15:19:00 -05:00
{{ svg "octicon-x" }}
2020-01-11 02:29:34 -05:00
{{ $ .i18n .Tr "repo.pulls.cannot_auto_merge_desc" }}
</div>
<div class="item text grey">
2020-09-11 15:19:00 -05:00
{{ svg "octicon-info" }}
2020-01-11 02:29:34 -05:00
{{ $ .i18n .Tr "repo.pulls.cannot_auto_merge_helper" }}
</div>
{{ end }}
2017-03-17 00:57:43 -05:00
{{ end }}
2020-06-13 13:49:59 -05:00
{{ if and ( gt .Issue .PullRequest .CommitsBehind 0 ) ( not .Issue .IsClosed ) ( not .Issue .PullRequest .IsChecking ) ( not .IsPullFilesConflicted ) ( not .IsPullRequestBroken ) ( not $ canAutoMerge ) }}
<div class="item text grey">
2020-09-11 15:19:00 -05:00
<i class="icon icon-octicon"> {{ svg "octicon-alert" }} </i>
2020-06-13 13:49:59 -05:00
{{ $ .i18n .Tr "repo.pulls.outdated_with_base_branch" }}
{{ if .UpdateAllowed }}
<form action=" {{ .Link }} /update" method="post" class="ui floating right">
{{ .CsrfTokenHtml }}
<button class="ui compact button" data-do="update">
<span class="ui text"> {{ $ .i18n .Tr "repo.pulls.update_branch" }} </span>
</button>
</form>
{{ end }}
</div>
{{ end }}
2017-03-17 00:57:43 -05:00
</div>
</div>
</div>
