2023-05-03 21:52:19 +08:00
|
|
|
{{if and .Issue.PullRequest.HasMerged (not .IsPullBranchDeletable)}}
|
|
|
|
{{/* Then the merge box will not be displayed because this page already contains enough information */}}
|
|
|
|
{{else}}
|
2020-04-11 06:01:41 +08:00
|
|
|
<div class="timeline-item comment merge box">
|
2023-08-04 01:58:41 +08:00
|
|
|
<div class="timeline-avatar text {{if .Issue.PullRequest.HasMerged}}purple
|
2020-04-03 13:12:42 +08: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-29 03:30:46 +08:00
|
|
|
{{- else if .IsBlockedByOfficialReviewRequests}}red
|
2020-04-17 09:00:36 +08:00
|
|
|
{{- else if .IsBlockedByOutdatedBranch}}red
|
2020-10-14 02:50:57 +08:00
|
|
|
{{- else if .IsBlockedByChangedProtectedFiles}}red
|
2020-04-03 13:12:42 +08:00
|
|
|
{{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsFailure .RequiredStatusCheckState.IsError)}}red
|
2023-10-09 06:16:06 +08:00
|
|
|
{{- else if and .EnableStatusCheck (or (not $.LatestCommitStatus) .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}yellow
|
2020-08-24 05:59:41 +08:00
|
|
|
{{- else if and .AllowMerge .RequireSigned (not .WillSign)}}red
|
2020-04-03 13:12:42 +08:00
|
|
|
{{- else if .Issue.PullRequest.IsChecking}}yellow
|
2021-03-04 11:41:23 +08:00
|
|
|
{{- else if .Issue.PullRequest.IsEmpty}}grey
|
2020-04-03 13:12:42 +08:00
|
|
|
{{- else if .Issue.PullRequest.CanAutoMerge}}green
|
2023-08-04 01:58:41 +08:00
|
|
|
{{- else}}red{{end}}">{{svg "octicon-git-merge" 40}}</div>
|
2017-03-17 13:57:43 +08:00
|
|
|
<div class="content">
|
2023-11-02 22:49:02 +08:00
|
|
|
<div class="ui attached segment fitted">
|
|
|
|
{{template "repo/pulls/status" (dict
|
|
|
|
"CommitStatus" .LatestCommitStatus
|
|
|
|
"CommitStatuses" .LatestCommitStatuses
|
2024-02-19 17:57:08 +08:00
|
|
|
"MissingRequiredChecks" .MissingRequiredChecks
|
2023-11-02 22:49:02 +08:00
|
|
|
"ShowHideChecks" true
|
|
|
|
"is_context_required" .is_context_required
|
|
|
|
)}}
|
|
|
|
</div>
|
2023-02-21 18:03:41 +08:00
|
|
|
{{$showGeneralMergeForm := false}}
|
2023-06-15 00:40:15 +08:00
|
|
|
<div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}} flex-items-block">
|
2017-03-17 13:57:43 +08:00
|
|
|
{{if .Issue.PullRequest.HasMerged}}
|
2023-05-03 21:52:19 +08:00
|
|
|
{{if .IsPullBranchDeletable}}
|
|
|
|
<div class="item item-section text gt-f1">
|
|
|
|
<div class="item-section-left">
|
|
|
|
<h3 class="gt-mb-3">
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.merged_success"}}
|
2023-05-03 21:52:19 +08:00
|
|
|
</h3>
|
|
|
|
<div class="merge-section-info">
|
2024-02-25 18:45:56 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.merged_info_text" (HTMLFormat "<code>%s</code>" .HeadTarget)}}
|
2023-05-03 21:52:19 +08:00
|
|
|
</div>
|
2023-04-24 02:12:36 +08:00
|
|
|
</div>
|
|
|
|
<div class="item-section-right">
|
2023-09-25 16:56:50 +08:00
|
|
|
<button class="delete-button ui button" data-url="{{.DeleteBranchLink}}">{{ctx.Locale.Tr "repo.branch.delete_html"}}</button>
|
2023-04-24 02:12:36 +08:00
|
|
|
</div>
|
2023-05-03 21:52:19 +08:00
|
|
|
</div>
|
|
|
|
{{end}}
|
2017-03-17 13:57:43 +08:00
|
|
|
{{else if .Issue.IsClosed}}
|
2023-04-24 02:12:36 +08:00
|
|
|
<div class="item item-section text gt-f1">
|
|
|
|
<div class="item-section-left">
|
2023-09-25 16:56:50 +08:00
|
|
|
<h3 class="gt-mb-3">{{ctx.Locale.Tr "repo.pulls.closed"}}</h3>
|
2023-04-24 02:12:36 +08:00
|
|
|
<div class="merge-section-info">
|
|
|
|
{{if .IsPullRequestBroken}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.cant_reopen_deleted_branch"}}
|
2023-04-24 02:12:36 +08:00
|
|
|
{{else}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.reopen_to_merge"}}
|
2023-04-24 02:12:36 +08:00
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
{{if and .IsPullBranchDeletable (not .IsPullRequestBroken)}}
|
|
|
|
<div class="item-section-right">
|
2023-09-25 16:56:50 +08:00
|
|
|
<button class="delete-button ui button" data-url="{{.DeleteBranchLink}}">{{ctx.Locale.Tr "repo.branch.delete_html"}}</button>
|
2023-04-24 02:12:36 +08:00
|
|
|
</div>
|
2019-04-21 04:50:34 +08:00
|
|
|
{{end}}
|
2017-03-17 13:57:43 +08:00
|
|
|
</div>
|
2019-02-05 19:54:49 +08:00
|
|
|
{{else if .IsPullFilesConflicted}}
|
2023-06-15 00:40:15 +08:00
|
|
|
<div class="item">
|
2020-09-12 04:19:00 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.files_conflicted"}}
|
2019-02-05 19:54:49 +08:00
|
|
|
</div>
|
2023-06-15 00:40:15 +08:00
|
|
|
<ul>
|
|
|
|
{{range .ConflictedFiles}}
|
|
|
|
<li>{{.}}</li>
|
|
|
|
{{end}}
|
|
|
|
</ul>
|
2018-08-01 11:00:35 +08:00
|
|
|
{{else if .IsPullRequestBroken}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.data_broken"}}
|
2017-03-17 13:57:43 +08:00
|
|
|
</div>
|
2018-08-14 03:04:39 +08:00
|
|
|
{{else if .IsPullWorkInProgress}}
|
2023-06-15 00:40:15 +08:00
|
|
|
<div class="item toggle-wip" data-title="{{.Issue.Title}}" data-wip-prefix="{{(.WorkInProgressPrefix|Escape)}}" data-update-url="{{.Issue.Link}}/title">
|
|
|
|
<div class="item-section-left flex-text-inline gt-f1">
|
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.cannot_merge_work_in_progress"}}
|
2021-05-28 04:02:04 +08:00
|
|
|
</div>
|
2023-06-15 00:40:15 +08:00
|
|
|
{{if or .HasIssuesOrPullsWritePermission .IsIssuePoster}}
|
|
|
|
<button class="ui compact button">
|
2024-02-23 01:02:33 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.remove_prefix" (.WorkInProgressPrefix|Escape)}}
|
2023-06-15 00:40:15 +08:00
|
|
|
</button>
|
|
|
|
{{end}}
|
2018-08-14 03:04:39 +08:00
|
|
|
</div>
|
2023-03-31 01:00:49 +08:00
|
|
|
{{template "repo/issue/view_content/update_branch_by_merge" $}}
|
2017-03-17 13:57:43 +08:00
|
|
|
{{else if .Issue.PullRequest.IsChecking}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-sync"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.is_checking"}}
|
2017-03-17 13:57:43 +08:00
|
|
|
</div>
|
2022-07-13 16:22:51 +08:00
|
|
|
{{else if .Issue.PullRequest.IsAncestor}}
|
2021-05-28 04:02:04 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-alert"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.is_ancestor"}}
|
2021-03-04 11:41:23 +08:00
|
|
|
</div>
|
2022-07-13 16:22:51 +08:00
|
|
|
{{else if or .Issue.PullRequest.CanAutoMerge .Issue.PullRequest.IsEmpty}}
|
2020-01-11 15:29:34 +08:00
|
|
|
{{if .IsBlockedByApprovals}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .ProtectedBranch.RequiredApprovals}}
|
2020-01-11 15:29:34 +08:00
|
|
|
</div>
|
|
|
|
{{else if .IsBlockedByRejection}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.blocked_by_rejection"}}
|
2020-01-11 15:29:34 +08:00
|
|
|
</div>
|
2020-11-29 03:30:46 +08:00
|
|
|
{{else if .IsBlockedByOfficialReviewRequests}}
|
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.blocked_by_official_review_requests"}}
|
2020-11-29 03:30:46 +08:00
|
|
|
</div>
|
2020-04-17 09:00:36 +08:00
|
|
|
{{else if .IsBlockedByOutdatedBranch}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.blocked_by_outdated_branch"}}
|
2020-04-17 09:00:36 +08:00
|
|
|
</div>
|
2020-10-14 02:50:57 +08:00
|
|
|
{{else if .IsBlockedByChangedProtectedFiles}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-x"}}
|
2024-02-23 01:02:33 +08:00
|
|
|
{{ctx.Locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n"}}
|
2020-10-14 02:50:57 +08:00
|
|
|
</div>
|
2023-06-15 00:40:15 +08:00
|
|
|
<ul>
|
|
|
|
{{range .ChangedProtectedFiles}}
|
|
|
|
<li>{{.}}</li>
|
|
|
|
{{end}}
|
|
|
|
</ul>
|
2020-01-22 11:46:04 +08:00
|
|
|
{{else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsError .RequiredStatusCheckState.IsFailure)}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.required_status_check_failed"}}
|
2020-01-11 15:29:34 +08:00
|
|
|
</div>
|
2020-04-16 04:35:18 +08:00
|
|
|
{{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.required_status_check_missing"}}
|
2020-04-16 04:35:18 +08:00
|
|
|
</div>
|
2020-08-24 05:59:41 +08:00
|
|
|
{{else if and .AllowMerge .RequireSigned (not .WillSign)}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.require_signed_wont_sign"}}
|
2020-01-15 16:32:57 +08:00
|
|
|
</div>
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-unlock"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
|
2020-01-15 16:32:57 +08:00
|
|
|
</div>
|
2019-09-18 13:39:45 +08:00
|
|
|
{{end}}
|
2022-06-11 22:44:20 +08:00
|
|
|
|
2020-11-29 03:30:46 +08:00
|
|
|
{{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOfficialReviewRequests .IsBlockedByOutdatedBranch .IsBlockedByChangedProtectedFiles (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}}
|
2022-06-11 22:44:20 +08:00
|
|
|
|
Fix various typos (#20338)
* Fix various typos
Found via `codespell -q 3 -S ./options/locale,./options/license,./public/vendor -L actived,allways,attachements,ba,befores,commiter,pullrequest,pullrequests,readby,splitted,te,unknwon`
Co-authored-by: zeripath <art27@cantab.net>
2022-07-13 05:32:37 +08:00
|
|
|
{{/* admin can merge without checks, writer can merge when checks succeed */}}
|
2022-06-11 22:44:20 +08:00
|
|
|
{{$canMergeNow := and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}}
|
|
|
|
{{/* admin and writer both can make an auto merge schedule */}}
|
|
|
|
|
|
|
|
{{if $canMergeNow}}
|
2020-01-17 05:01:22 +08:00
|
|
|
{{if $notAllOverridableChecksOk}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-dot-fill"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.required_status_check_administrator"}}
|
2018-12-27 18:27:08 +08:00
|
|
|
</div>
|
2019-09-18 13:39:45 +08:00
|
|
|
{{else}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-check"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.can_auto_merge_desc"}}
|
2018-01-06 02:56:50 +08:00
|
|
|
</div>
|
2019-09-18 13:39:45 +08:00
|
|
|
{{end}}
|
2020-01-15 16:32:57 +08:00
|
|
|
{{if .WillSign}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-lock" 16 "text green"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.signing.will_sign" .SigningKey}}
|
2020-01-15 16:32:57 +08:00
|
|
|
</div>
|
2020-01-16 06:55:25 +08:00
|
|
|
{{else if .IsSigned}}
|
2020-11-16 04:58:16 +08:00
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-unlock"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
|
2020-01-15 16:32:57 +08:00
|
|
|
</div>
|
|
|
|
{{end}}
|
2020-06-14 02:49:59 +08:00
|
|
|
{{end}}
|
2023-03-31 01:00:49 +08:00
|
|
|
{{template "repo/issue/view_content/update_branch_by_merge" $}}
|
2022-07-13 16:22:51 +08:00
|
|
|
{{if .Issue.PullRequest.IsEmpty}}
|
2023-06-29 20:24:22 +08:00
|
|
|
<div class="divider"></div>
|
2022-07-13 16:22:51 +08:00
|
|
|
|
|
|
|
<div class="item">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-alert"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.is_empty"}}
|
2022-07-13 16:22:51 +08:00
|
|
|
</div>
|
|
|
|
{{end}}
|
2020-06-14 02:49:59 +08:00
|
|
|
|
2022-06-11 22:44:20 +08:00
|
|
|
{{if .AllowMerge}} {{/* user is allowed to merge */}}
|
2022-12-10 10:46:31 +08:00
|
|
|
{{$prUnit := .Repository.MustGetUnit $.Context $.UnitTypePullRequests}}
|
2023-10-11 12:24:07 +08:00
|
|
|
{{$approvers := (.Issue.PullRequest.GetApprovers ctx)}}
|
2024-02-13 06:37:23 +08:00
|
|
|
{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash $prUnit.PullRequestsConfig.AllowFastForwardOnly}}
|
2022-06-11 22:44:20 +08:00
|
|
|
{{$hasPendingPullRequestMergeTip := ""}}
|
|
|
|
{{if .HasPendingPullRequestMerge}}
|
2023-09-25 20:42:40 +08:00
|
|
|
{{$createdPRMergeStr := TimeSinceUnix .PendingPullRequestMerge.CreatedUnix ctx.Locale}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{$hasPendingPullRequestMergeTip = ctx.Locale.Tr "repo.pulls.auto_merge_has_pending_schedule" .PendingPullRequestMerge.Doer.Name $createdPRMergeStr}}
|
2022-06-11 22:44:20 +08:00
|
|
|
{{end}}
|
2023-06-29 20:24:22 +08:00
|
|
|
<div class="divider"></div>
|
2023-02-10 00:31:30 +08:00
|
|
|
<script type="module">
|
|
|
|
const issueUrl = window.location.origin + {{$.Issue.Link}};
|
|
|
|
const defaultMergeTitle = {{.DefaultMergeMessage}};
|
|
|
|
const defaultSquashMergeTitle = {{.DefaultSquashMergeMessage}};
|
|
|
|
const defaultMergeMessage = {{if .DefaultMergeBody}}{{.DefaultMergeBody}}{{else}}`Reviewed-on: ${issueUrl}\n` + {{$approvers}}{{end}};
|
|
|
|
const defaultSquashMergeMessage = {{if .DefaultSquashMergeBody}}{{.DefaultSquashMergeBody}}{{else}}`Reviewed-on: ${issueUrl}\n` + {{$approvers}}{{end}};
|
|
|
|
const mergeForm = {
|
|
|
|
'baseLink': {{.Link}},
|
2023-09-25 16:56:50 +08:00
|
|
|
'textCancel': {{ctx.Locale.Tr "cancel"}},
|
|
|
|
'textDeleteBranch': {{ctx.Locale.Tr "repo.branch.delete" .HeadTarget}},
|
|
|
|
'textAutoMergeButtonWhenSucceed': {{ctx.Locale.Tr "repo.pulls.auto_merge_button_when_succeed"}},
|
|
|
|
'textAutoMergeWhenSucceed': {{ctx.Locale.Tr "repo.pulls.auto_merge_when_succeed"}},
|
|
|
|
'textAutoMergeCancelSchedule': {{ctx.Locale.Tr "repo.pulls.auto_merge_cancel_schedule"}},
|
|
|
|
'textClearMergeMessage': {{ctx.Locale.Tr "repo.pulls.clear_merge_message"}},
|
|
|
|
'textClearMergeMessageHint': {{ctx.Locale.Tr "repo.pulls.clear_merge_message_hint"}},
|
|
|
|
'textMergeCommitId': {{ctx.Locale.Tr "repo.pulls.merge_commit_id"}},
|
2022-05-12 21:39:02 +08:00
|
|
|
|
2023-02-10 00:31:30 +08:00
|
|
|
'canMergeNow': {{$canMergeNow}},
|
|
|
|
'allOverridableChecksOk': {{not $notAllOverridableChecksOk}},
|
|
|
|
'emptyCommit': {{.Issue.PullRequest.IsEmpty}},
|
|
|
|
'pullHeadCommitID': {{.PullHeadCommitID}},
|
|
|
|
'isPullBranchDeletable': {{.IsPullBranchDeletable}},
|
|
|
|
'defaultMergeStyle': {{.MergeStyle}},
|
|
|
|
'defaultDeleteBranchAfterMerge': {{$prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}},
|
2023-09-25 16:56:50 +08:00
|
|
|
'mergeMessageFieldPlaceHolder': {{ctx.Locale.Tr "repo.editor.commit_message_desc"}},
|
2023-02-10 00:31:30 +08:00
|
|
|
'defaultMergeMessage': defaultMergeMessage,
|
2022-05-12 21:39:02 +08:00
|
|
|
|
2023-02-10 00:31:30 +08:00
|
|
|
'hasPendingPullRequestMerge': {{.HasPendingPullRequestMerge}},
|
|
|
|
'hasPendingPullRequestMergeTip': {{$hasPendingPullRequestMergeTip}},
|
|
|
|
};
|
2022-05-12 21:39:02 +08:00
|
|
|
|
2023-02-14 01:59:59 +08:00
|
|
|
const generalHideAutoMerge = mergeForm.canMergeNow && mergeForm.allOverridableChecksOk; // if this pr can be merged now, then hide the auto merge
|
2023-02-10 00:31:30 +08:00
|
|
|
mergeForm['mergeStyles'] = [
|
|
|
|
{
|
|
|
|
'name': 'merge',
|
|
|
|
'allowed': {{$prUnit.PullRequestsConfig.AllowMerge}},
|
2023-09-25 16:56:50 +08:00
|
|
|
'textDoMerge': {{ctx.Locale.Tr "repo.pulls.merge_pull_request"}},
|
2023-02-10 00:31:30 +08:00
|
|
|
'mergeTitleFieldText': defaultMergeTitle,
|
|
|
|
'mergeMessageFieldText': defaultMergeMessage,
|
|
|
|
'hideAutoMerge': generalHideAutoMerge,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'name': 'rebase',
|
|
|
|
'allowed': {{$prUnit.PullRequestsConfig.AllowRebase}},
|
2023-09-25 16:56:50 +08:00
|
|
|
'textDoMerge': {{ctx.Locale.Tr "repo.pulls.rebase_merge_pull_request"}},
|
2023-02-10 00:31:30 +08:00
|
|
|
'hideMergeMessageTexts': true,
|
|
|
|
'hideAutoMerge': generalHideAutoMerge,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'name': 'rebase-merge',
|
|
|
|
'allowed': {{$prUnit.PullRequestsConfig.AllowRebaseMerge}},
|
2023-09-25 16:56:50 +08:00
|
|
|
'textDoMerge': {{ctx.Locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}},
|
2023-02-10 00:31:30 +08:00
|
|
|
'mergeTitleFieldText': defaultMergeTitle,
|
|
|
|
'mergeMessageFieldText': defaultMergeMessage,
|
|
|
|
'hideAutoMerge': generalHideAutoMerge,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'name': 'squash',
|
|
|
|
'allowed': {{$prUnit.PullRequestsConfig.AllowSquash}},
|
2023-09-25 16:56:50 +08:00
|
|
|
'textDoMerge': {{ctx.Locale.Tr "repo.pulls.squash_merge_pull_request"}},
|
2023-02-10 00:31:30 +08:00
|
|
|
'mergeTitleFieldText': defaultSquashMergeTitle,
|
|
|
|
'mergeMessageFieldText': {{.GetCommitMessages}} + defaultSquashMergeMessage,
|
|
|
|
'hideAutoMerge': generalHideAutoMerge,
|
|
|
|
},
|
2024-02-13 06:37:23 +08:00
|
|
|
{
|
|
|
|
'name': 'fast-forward-only',
|
|
|
|
'allowed': {{and $prUnit.PullRequestsConfig.AllowFastForwardOnly (eq .Issue.PullRequest.CommitsBehind 0)}},
|
|
|
|
'textDoMerge': {{ctx.Locale.Tr "repo.pulls.fast_forward_only_merge_pull_request"}},
|
|
|
|
'hideMergeMessageTexts': true,
|
|
|
|
'hideAutoMerge': generalHideAutoMerge,
|
|
|
|
},
|
2023-02-10 00:31:30 +08:00
|
|
|
{
|
|
|
|
'name': 'manually-merged',
|
2023-10-30 11:13:06 +08:00
|
|
|
'allowed': {{$prUnit.PullRequestsConfig.AllowManualMerge}},
|
2023-09-25 16:56:50 +08:00
|
|
|
'textDoMerge': {{ctx.Locale.Tr "repo.pulls.merge_manually"}},
|
2023-02-10 00:31:30 +08:00
|
|
|
'hideMergeMessageTexts': true,
|
|
|
|
'hideAutoMerge': true,
|
|
|
|
}
|
|
|
|
];
|
|
|
|
window.config.pageData.pullRequestMergeForm = mergeForm;
|
2022-06-11 22:44:20 +08:00
|
|
|
</script>
|
2022-05-12 21:39:02 +08:00
|
|
|
|
2023-02-21 18:03:41 +08:00
|
|
|
{{$showGeneralMergeForm = true}}
|
2022-06-11 22:44:20 +08:00
|
|
|
<div id="pull-request-merge-form"></div>
|
2020-01-11 15:29:34 +08:00
|
|
|
{{else}}
|
2022-06-11 22:44:20 +08:00
|
|
|
{{/* no merge style was set in repo setting: not or ($prUnit.PullRequestsConfig.AllowMerge ...) */}}
|
2023-06-29 20:24:22 +08:00
|
|
|
<div class="divider"></div>
|
2022-06-11 22:44:20 +08:00
|
|
|
<div class="item text red">
|
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.no_merge_desc"}}
|
2022-06-11 22:44:20 +08:00
|
|
|
</div>
|
2021-05-28 04:02:04 +08:00
|
|
|
<div class="item">
|
2020-09-12 04:19:00 +08:00
|
|
|
{{svg "octicon-info"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.no_merge_helper"}}
|
2020-01-11 15:29:34 +08:00
|
|
|
</div>
|
2022-06-11 22:44:20 +08:00
|
|
|
{{end}} {{/* end if the repo was set to use any merge style */}}
|
|
|
|
{{else}}
|
|
|
|
{{/* user is not allowed to merge */}}
|
2023-06-29 20:24:22 +08:00
|
|
|
<div class="divider"></div>
|
2022-06-11 22:44:20 +08:00
|
|
|
<div class="item">
|
|
|
|
{{svg "octicon-info"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.no_merge_access"}}
|
2022-06-11 22:44:20 +08:00
|
|
|
</div>
|
|
|
|
{{end}} {{/* end if user is allowed to merge or not */}}
|
2017-03-17 13:57:43 +08:00
|
|
|
{{else}}
|
2020-01-11 15:29:34 +08:00
|
|
|
{{/* Merge conflict without specific file. Suggest manual merge, only if all reviews and status checks OK. */}}
|
|
|
|
{{if .IsBlockedByApprovals}}
|
|
|
|
<div class="item text red">
|
2020-09-12 04:19:00 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .ProtectedBranch.RequiredApprovals}}
|
2020-01-11 15:29:34 +08:00
|
|
|
</div>
|
|
|
|
{{else if .IsBlockedByRejection}}
|
|
|
|
<div class="item text red">
|
2020-09-12 04:19:00 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.blocked_by_rejection"}}
|
2020-11-29 03:30:46 +08:00
|
|
|
</div>
|
|
|
|
{{else if .IsBlockedByOfficialReviewRequests}}
|
|
|
|
<div class="item text red">
|
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.blocked_by_official_review_requests"}}
|
2020-01-11 15:29:34 +08:00
|
|
|
</div>
|
2020-04-17 09:00:36 +08:00
|
|
|
{{else if .IsBlockedByOutdatedBranch}}
|
|
|
|
<div class="item text red">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.blocked_by_outdated_branch"}}
|
2020-04-17 09:00:36 +08:00
|
|
|
</div>
|
2020-10-14 02:50:57 +08:00
|
|
|
{{else if .IsBlockedByChangedProtectedFiles}}
|
|
|
|
<div class="item text red">
|
2023-06-15 00:40:15 +08:00
|
|
|
{{svg "octicon-x"}}
|
2024-02-23 01:02:33 +08:00
|
|
|
{{ctx.Locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n"}}
|
2020-10-14 02:50:57 +08:00
|
|
|
</div>
|
2023-06-15 00:40:15 +08:00
|
|
|
<ul>
|
|
|
|
{{range .ChangedProtectedFiles}}
|
|
|
|
<li>{{.}}</li>
|
|
|
|
{{end}}
|
|
|
|
</ul>
|
2020-04-16 04:35:18 +08:00
|
|
|
{{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}}
|
2020-01-11 15:29:34 +08:00
|
|
|
<div class="item text red">
|
2020-09-12 04:19:00 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.required_status_check_failed"}}
|
2020-01-11 15:29:34 +08:00
|
|
|
</div>
|
2020-01-15 16:32:57 +08:00
|
|
|
{{else if and .RequireSigned (not .WillSign)}}
|
|
|
|
<div class="item text red">
|
2020-09-12 04:19:00 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.require_signed_wont_sign"}}
|
2020-01-15 16:32:57 +08:00
|
|
|
</div>
|
2020-01-11 15:29:34 +08:00
|
|
|
{{else}}
|
|
|
|
<div class="item text red">
|
2020-09-12 04:19:00 +08:00
|
|
|
{{svg "octicon-x"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.cannot_auto_merge_desc"}}
|
2020-01-11 15:29:34 +08:00
|
|
|
</div>
|
2021-05-28 04:02:04 +08:00
|
|
|
<div class="item">
|
2020-09-12 04:19:00 +08:00
|
|
|
{{svg "octicon-info"}}
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.cannot_auto_merge_helper"}}
|
2020-01-11 15:29:34 +08:00
|
|
|
</div>
|
|
|
|
{{end}}
|
2023-02-21 18:03:41 +08:00
|
|
|
{{end}}{{/* end if: pull request status */}}
|
2020-06-14 02:49:59 +08:00
|
|
|
|
2023-04-24 03:48:51 +08:00
|
|
|
{{/*
|
2023-10-30 11:13:06 +08:00
|
|
|
Manually Merged is not a well-known feature, it is used to mark a non-mergeable PR (already merged, conflicted) as merged
|
2023-04-24 03:48:51 +08:00
|
|
|
To test it:
|
|
|
|
* Enable "Manually Merged" feature in the Repository Settings
|
|
|
|
* Create a pull request, either:
|
|
|
|
* - Merge the pull request branch locally and push the merged commit to Gitea
|
|
|
|
* - Make some conflicts between the base branch and the pull request branch
|
2023-10-30 11:13:06 +08:00
|
|
|
* Then the Manually Merged form will be shown in the merge form
|
2023-04-24 03:48:51 +08:00
|
|
|
*/}}
|
2023-02-21 18:03:41 +08:00
|
|
|
{{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
|
2023-06-29 20:24:22 +08:00
|
|
|
<div class="divider"></div>
|
2023-02-21 18:03:41 +08:00
|
|
|
<div class="ui form">
|
2021-03-04 11:41:23 +08:00
|
|
|
<form action="{{.Link}}/merge" method="post">
|
|
|
|
{{.CsrfTokenHtml}}
|
|
|
|
<div class="field">
|
2023-09-25 16:56:50 +08:00
|
|
|
<input type="text" name="merge_commit_id" placeholder="{{ctx.Locale.Tr "repo.pulls.merge_commit_id"}}">
|
2021-03-04 11:41:23 +08:00
|
|
|
</div>
|
|
|
|
<button class="ui red button" type="submit" name="do" value="manually-merged">
|
2023-09-25 16:56:50 +08:00
|
|
|
{{ctx.Locale.Tr "repo.pulls.merge_manually"}}
|
2021-03-04 11:41:23 +08:00
|
|
|
</button>
|
|
|
|
</form>
|
|
|
|
</div>
|
|
|
|
{{end}}
|
2023-02-15 23:31:35 +08:00
|
|
|
|
2023-10-25 23:01:31 +08:00
|
|
|
{{if and .Issue.PullRequest.HeadRepo (not .Issue.PullRequest.HasMerged) (not .Issue.IsClosed)}}
|
|
|
|
{{template "repo/issue/view_content/pull_merge_instruction" dict "PullRequest" .Issue.PullRequest "ShowMergeInstructions" .ShowMergeInstructions}}
|
2023-02-15 23:31:35 +08:00
|
|
|
{{end}}
|
2017-03-17 13:57:43 +08:00
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
2023-05-03 21:52:19 +08:00
|
|
|
{{end}}
|