From dd17521808437a00963bcc3e61bda85f5f782bdd Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 4 May 2026 14:15:33 +0800 Subject: [PATCH] Refactor pull request view (6) (#37522) Clean up legacy logic. * Use backend logic to choose PR timeline icon color * Always use the Vue form to merge, remove the "StillCanManualMerge" logic --- routers/web/repo/issue_view.go | 21 +-- routers/web/repo/pull.go | 21 ++- routers/web/repo/pull_merge_box.go | 33 ++++ routers/web/repo/pull_merge_form.go | 115 ++++++++----- templates/devtest/flex-list.tmpl | 18 +-- templates/repo/commit_statuses.tmpl | 6 +- .../issue/view_content/pull_merge_box.tmpl | 152 ++++-------------- .../pull_merge_status_checks.tmpl | 35 ++++ .../view_content/update_branch_by_merge.tmpl | 40 ++--- templates/repo/pulls/status.tmpl | 63 -------- templates/repo/pulls/status_items.tmpl | 32 ++++ web_src/css/modules/segment.css | 9 +- web_src/css/repo.css | 1 + web_src/css/shared/flex-list.css | 23 ++- .../js/components/PullRequestMergeForm.vue | 39 +++-- web_src/js/features/repo-issue-pull.ts | 1 + 16 files changed, 293 insertions(+), 316 deletions(-) create mode 100644 routers/web/repo/pull_merge_box.go create mode 100644 templates/repo/issue/view_content/pull_merge_status_checks.tmpl delete mode 100644 templates/repo/pulls/status.tmpl create mode 100644 templates/repo/pulls/status_items.tmpl diff --git a/routers/web/repo/issue_view.go b/routers/web/repo/issue_view.go index 852b880ab05..28fdfb34faa 100644 --- a/routers/web/repo/issue_view.go +++ b/routers/web/repo/issue_view.go @@ -835,14 +835,14 @@ func (prInfo *pullRequestViewInfo) prepareMergeBox(ctx *context.Context, issue * } canDelete := false - allowMerge := false canWriteToHeadRepo := false pull_service.StartPullRequestCheckOnView(ctx, pull) if !prInfo.IsPullRequestBroken { + data.ShowUpdatePullInfo = pull.CommitsBehind > 0 && !issue.IsClosed && !pull.IsChecking() && !pull.IsFilesConflicted() && !prInfo.IsPullRequestBroken var err error - ctx.Data["UpdateAllowed"], ctx.Data["UpdateByRebaseAllowed"], err = pull_service.IsUserAllowedToUpdate(ctx, pull, ctx.Doer) + data.UpdateAllowed, data.UpdateByRebaseAllowed, err = pull_service.IsUserAllowedToUpdate(ctx, pull, ctx.Doer) if err != nil { ctx.ServerError("IsUserAllowedToUpdate", err) return @@ -888,7 +888,7 @@ func (prInfo *pullRequestViewInfo) prepareMergeBox(ctx *context.Context, issue * if !canWriteToHeadRepo { // maintainers maybe allowed to push to head repo even if they can't write to it canWriteToHeadRepo = pull.AllowMaintainerEdit && perm.CanWrite(unit.TypeCode) } - allowMerge, err = pull_service.IsUserAllowedToMerge(ctx, pull, perm, ctx.Doer) + data.allowMerge, err = pull_service.IsUserAllowedToMerge(ctx, pull, perm, ctx.Doer) if err != nil { ctx.ServerError("IsUserAllowedToMerge", err) return @@ -903,7 +903,7 @@ func (prInfo *pullRequestViewInfo) prepareMergeBox(ctx *context.Context, issue * data.ReloadingInterval = util.Iif(pull.IsChecking(), 2000, 0) data.ShowMergeInstructions = canWriteToHeadRepo data.ShowPullCommands = pull.HeadRepo != nil && !pull.HasMerged && !issue.IsClosed - ctx.Data["AllowMerge"] = allowMerge + ctx.Data["AllowMerge"] = data.allowMerge pb := prInfo.ProtectedBranchRule if pb != nil { @@ -947,18 +947,6 @@ func (prInfo *pullRequestViewInfo) prepareMergeBox(ctx *context.Context, issue * prConfig := issue.Repo.MustGetUnit(ctx, unit.TypePullRequests).PullRequestsConfig() data.AutodetectManualMerge = prConfig.AutodetectManualMerge - stillCanManualMerge := func() bool { - if pull.HasMerged || issue.IsClosed || !ctx.IsSigned { - return false - } - if pull.IsStatusMergeable() || pull.IsWorkInProgress(ctx) || pull.IsChecking() { - return false - } - return allowMerge && prConfig.AllowManualMerge - } - - ctx.Data["StillCanManualMerge"] = stillCanManualMerge() - enableStatusCheck := pb != nil && pb.EnableStatusCheck ctx.Data["EnableStatusCheck"] = enableStatusCheck @@ -989,6 +977,7 @@ func (prInfo *pullRequestViewInfo) prepareMergeBox(ctx *context.Context, issue * ctx.Data["PullMergeBoxData"] = prInfo.MergeBoxData prInfo.prepareMergeBoxFormProps(ctx) + prInfo.prepareMergeBoxIconColor() } func prepareIssueViewContent(ctx *context.Context, issue *issues_model.Issue) { diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 7406c1d1228..404f77beb7a 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -266,8 +266,15 @@ type pullMergeBoxData struct { ShowMergeBox bool ReloadingInterval int + TimelineIconClass string + HasOverridableBlockers bool - CanMergeNow bool + CanMergeNow bool // PR is mergeable, either no blocker, or doer is admin and can bypass the blockers + allowMerge bool // doer has permission to merge + + ShowUpdatePullInfo bool + UpdateAllowed bool + UpdateByRebaseAllowed bool MergeFormProps map[string]any ShowPullCommands bool @@ -302,6 +309,9 @@ type pullRequestViewInfo struct { StatusCheckData *pullCommitStatusCheckData CommitStatuses []*git_model.CommitStatus MergeBoxData *pullMergeBoxData + + enableStatusCheck bool + workInProgressPrefix string } func newPullRequestViewInfo() *pullRequestViewInfo { @@ -430,8 +440,8 @@ func (prInfo *pullRequestViewInfo) prepareViewFillCommitStatusInfoForOpen(ctx *c } pb := prInfo.ProtectedBranchRule - enableStatusCheck := pb != nil && pb.EnableStatusCheck - if !enableStatusCheck { + prInfo.enableStatusCheck = pb != nil && pb.EnableStatusCheck + if !prInfo.enableStatusCheck { return } @@ -549,9 +559,10 @@ func (prInfo *pullRequestViewInfo) prepareViewOpenPullInfo(ctx *context.Context) } // this one is used by both sidebar and merge-box + prInfo.workInProgressPrefix = pull.GetWorkInProgressPrefix(ctx) if pull.IsWorkInProgress(ctx) { - ctx.Data["IsPullWorkInProgress"] = true - ctx.Data["WorkInProgressPrefix"] = pull.GetWorkInProgressPrefix(ctx) + ctx.Data["IsPullWorkInProgress"] = prInfo.workInProgressPrefix != "" + ctx.Data["WorkInProgressPrefix"] = prInfo.workInProgressPrefix } } diff --git a/routers/web/repo/pull_merge_box.go b/routers/web/repo/pull_merge_box.go new file mode 100644 index 00000000000..4163d98cbfd --- /dev/null +++ b/routers/web/repo/pull_merge_box.go @@ -0,0 +1,33 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package repo + +func (prInfo *pullRequestViewInfo) prepareMergeBoxIconColor() { + pull := prInfo.issue.PullRequest + mergeBoxData := prInfo.MergeBoxData + statusCheckData := prInfo.StatusCheckData + switch { + case pull.HasMerged: + prInfo.MergeBoxData.TimelineIconClass = "tw-text-purple" + case prInfo.issue.IsClosed, prInfo.workInProgressPrefix != "", pull.IsFilesConflicted(): + prInfo.MergeBoxData.TimelineIconClass = "tw-text-text-light" + case prInfo.IsPullRequestBroken, mergeBoxData.isBlockedByApprovals, mergeBoxData.isBlockedByRejection, + mergeBoxData.isBlockedByOfficialReviewRequests, mergeBoxData.isBlockedByOutdatedBranch, mergeBoxData.isBlockedByChangedProtectedFiles: + prInfo.MergeBoxData.TimelineIconClass = "tw-text-red" + case prInfo.enableStatusCheck && (statusCheckData.RequiredChecksState.IsFailure() || statusCheckData.RequiredChecksState.IsError()): + prInfo.MergeBoxData.TimelineIconClass = "tw-text-red" + case prInfo.enableStatusCheck && (statusCheckData.LatestCommitStatus == nil || statusCheckData.RequiredChecksState.IsPending() || statusCheckData.RequiredChecksState.IsWarning()): + prInfo.MergeBoxData.TimelineIconClass = "tw-text-yellow" + case mergeBoxData.allowMerge && mergeBoxData.requireSigned && !mergeBoxData.willSign: + prInfo.MergeBoxData.TimelineIconClass = "tw-text-red" + case pull.IsChecking(): + prInfo.MergeBoxData.TimelineIconClass = "tw-text-yellow" + case pull.IsEmpty(): + prInfo.MergeBoxData.TimelineIconClass = "tw-text-text-light" + case pull.IsStatusMergeable(): + prInfo.MergeBoxData.TimelineIconClass = "tw-text-green" + default: + prInfo.MergeBoxData.TimelineIconClass = "tw-text-red" + } +} diff --git a/routers/web/repo/pull_merge_form.go b/routers/web/repo/pull_merge_form.go index b390fd69349..0cc2bfc27b0 100644 --- a/routers/web/repo/pull_merge_form.go +++ b/routers/web/repo/pull_merge_form.go @@ -16,6 +16,13 @@ import ( func (prInfo *pullRequestViewInfo) prepareMergeBoxFormProps(ctx *context.Context) { pull := prInfo.issue.PullRequest + if pull.HasMerged || prInfo.issue.IsClosed { + return + } + if !prInfo.MergeBoxData.allowMerge { + return + } + prConfig := ctx.Repo.Repository.MustGetUnit(ctx, unit.TypePullRequests).PullRequestsConfig() // Check correct values and select default @@ -69,7 +76,7 @@ func (prInfo *pullRequestViewInfo) prepareMergeBoxFormProps(ctx *context.Context } allOverridableChecksOk := !prInfo.MergeBoxData.HasOverridableBlockers - prInfo.MergeBoxData.MergeFormProps = map[string]any{ + mergeFormProps := map[string]any{ "baseLink": prInfo.issue.Link(), "textCancel": ctx.Locale.Tr("cancel"), "textDeleteBranch": ctx.Locale.Tr("repo.branch.delete", prInfo.headTarget), @@ -97,51 +104,75 @@ func (prInfo *pullRequestViewInfo) prepareMergeBoxFormProps(ctx *context.Context // if this pr can be merged now, then hide the auto merge generalHideAutoMerge := prInfo.MergeBoxData.CanMergeNow && allOverridableChecksOk - prInfo.MergeBoxData.MergeFormProps["mergeStyles"] = []any{ - map[string]any{ - "name": "merge", - "allowed": prConfig.AllowMerge, - "textDoMerge": ctx.Locale.Tr("repo.pulls.merge_pull_request"), - "mergeTitleFieldText": defaultMergeTitle, - "mergeMessageFieldText": defaultMergeBody, - "hideAutoMerge": generalHideAutoMerge, - }, - map[string]any{ - "name": "rebase", - "allowed": prConfig.AllowRebase, - "textDoMerge": ctx.Locale.Tr("repo.pulls.rebase_merge_pull_request"), - "hideMergeMessageTexts": true, - "hideAutoMerge": generalHideAutoMerge, - }, - map[string]any{ - "name": "rebase-merge", - "allowed": prConfig.AllowRebaseMerge, - "textDoMerge": ctx.Locale.Tr("repo.pulls.rebase_merge_commit_pull_request"), - "mergeTitleFieldText": defaultMergeTitle, - "mergeMessageFieldText": defaultMergeBody, - "hideAutoMerge": generalHideAutoMerge, - }, - map[string]any{ - "name": "squash", - "allowed": prConfig.AllowSquash, - "textDoMerge": ctx.Locale.Tr("repo.pulls.squash_merge_pull_request"), - "mergeTitleFieldText": defaultSquashMergeTitle, - "mergeMessageFieldText": defaultSquashMergeCommitMessages + defaultSquashMergeBody, - "hideAutoMerge": generalHideAutoMerge, - }, - map[string]any{ - "name": "fast-forward-only", - "allowed": prConfig.AllowFastForwardOnly && pull.CommitsBehind == 0, - "textDoMerge": ctx.Locale.Tr("repo.pulls.fast_forward_only_merge_pull_request"), - "hideMergeMessageTexts": true, - "hideAutoMerge": generalHideAutoMerge, - }, - map[string]any{ + var mergeStyles []any + if pull.IsStatusMergeable() { + mergeStyles = []any{ + map[string]any{ + "name": "merge", + "allowed": prConfig.AllowMerge, + "textDoMerge": ctx.Locale.Tr("repo.pulls.merge_pull_request"), + "mergeTitleFieldText": defaultMergeTitle, + "mergeMessageFieldText": defaultMergeBody, + "hideAutoMerge": generalHideAutoMerge, + }, + map[string]any{ + "name": "rebase", + "allowed": prConfig.AllowRebase, + "textDoMerge": ctx.Locale.Tr("repo.pulls.rebase_merge_pull_request"), + "hideMergeMessageTexts": true, + "hideAutoMerge": generalHideAutoMerge, + }, + map[string]any{ + "name": "rebase-merge", + "allowed": prConfig.AllowRebaseMerge, + "textDoMerge": ctx.Locale.Tr("repo.pulls.rebase_merge_commit_pull_request"), + "mergeTitleFieldText": defaultMergeTitle, + "mergeMessageFieldText": defaultMergeBody, + "hideAutoMerge": generalHideAutoMerge, + }, + map[string]any{ + "name": "squash", + "allowed": prConfig.AllowSquash, + "textDoMerge": ctx.Locale.Tr("repo.pulls.squash_merge_pull_request"), + "mergeTitleFieldText": defaultSquashMergeTitle, + "mergeMessageFieldText": defaultSquashMergeCommitMessages + defaultSquashMergeBody, + "hideAutoMerge": generalHideAutoMerge, + }, + map[string]any{ + "name": "fast-forward-only", + "allowed": prConfig.AllowFastForwardOnly && pull.CommitsBehind == 0, + "textDoMerge": ctx.Locale.Tr("repo.pulls.fast_forward_only_merge_pull_request"), + "hideMergeMessageTexts": true, + "hideAutoMerge": generalHideAutoMerge, + }, + } + } + + canUseManualMerge := func() bool { + if pull.IsWorkInProgress(ctx) || pull.IsChecking() { + return false + } + return prConfig.AllowManualMerge + } + // Manually Merged is not a well-known feature, it is used to mark a non-mergeable PR (already merged, conflicted) as merged + // 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 + // Then the Manually Merged form will be shown in the merge form + if canUseManualMerge() { + mergeStyles = append(mergeStyles, map[string]any{ "name": "manually-merged", "allowed": prConfig.AllowManualMerge, "textDoMerge": ctx.Locale.Tr("repo.pulls.merge_manually"), "hideMergeMessageTexts": true, "hideAutoMerge": true, - }, + }) + } + + if len(mergeStyles) > 0 { + mergeFormProps["mergeStyles"] = mergeStyles + prInfo.MergeBoxData.MergeFormProps = mergeFormProps } } diff --git a/templates/devtest/flex-list.tmpl b/templates/devtest/flex-list.tmpl index 02f0df9ff92..22030202440 100644 --- a/templates/devtest/flex-list.tmpl +++ b/templates/devtest/flex-list.tmpl @@ -102,34 +102,26 @@

Flex List (with "ui segment fitted", items have their own padding)

-
-
+
+
item 1
item 2
-
-
item nested 1
-
item nested 2
-
item 3

If parent provides padding or items need their own flex and/or padding:

-
+
before divider
-
+
item 1
item 2
-
-
item nested 1
-
item nested 2
-
after divider
-
+
before divider
diff --git a/templates/repo/commit_statuses.tmpl b/templates/repo/commit_statuses.tmpl index 2f9f44fabe4..4575827cebc 100644 --- a/templates/repo/commit_statuses.tmpl +++ b/templates/repo/commit_statuses.tmpl @@ -9,10 +9,8 @@ {{end}}
-
-
- {{template "repo/pulls/status" (dict "CommitStatuses" .Statuses "CommitStatus" .Status)}} -
+
+ {{template "repo/pulls/status_items" (dict "CommitStatuses" .Statuses)}}
{{end}} diff --git a/templates/repo/issue/view_content/pull_merge_box.tmpl b/templates/repo/issue/view_content/pull_merge_box.tmpl index 2bda4ad83f6..610016e27c6 100644 --- a/templates/repo/issue/view_content/pull_merge_box.tmpl +++ b/templates/repo/issue/view_content/pull_merge_box.tmpl @@ -9,36 +9,17 @@ > {{$statusCheckData := .StatusCheckData}} {{$requiredStatusCheckState := $statusCheckData.RequiredChecksState}} -
{{svg "octicon-git-merge" 40}}
+
{{svg "octicon-git-merge" 40}}
-
-
+
+
{{if .LatestCommitStatus}} - {{template "repo/pulls/status" (dict - "CommitStatus" .LatestCommitStatus + {{template "repo/issue/view_content/pull_merge_status_checks" (dict "CommitStatuses" .LatestCommitStatuses - "ShowHideChecks" true "StatusCheckData" $statusCheckData )}} {{end}} - {{$showGeneralMergeForm := false}} {{if .Issue.PullRequest.HasMerged}} {{if .IsPullBranchDeletable}}
@@ -113,7 +94,7 @@ {{svg "octicon-alert"}} {{ctx.Locale.Tr "repo.pulls.is_ancestor"}}
- {{else if or .Issue.PullRequest.IsStatusMergeable .Issue.PullRequest.IsEmpty}} + {{else}} {{if .IsBlockedByApprovals}}
{{svg "octicon-x"}} @@ -167,6 +148,15 @@ {{svg "octicon-unlock"}} {{ctx.Locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
+ {{else if not .Issue.PullRequest.IsStatusMergeable}} +
+ {{svg "octicon-x"}} + {{ctx.Locale.Tr "repo.pulls.cannot_auto_merge_desc"}} +
+
+ {{svg "octicon-info"}} + {{ctx.Locale.Tr "repo.pulls.cannot_auto_merge_helper"}} +
{{end}} {{$notAllOverridableChecksOk := $data.HasOverridableBlockers}} @@ -197,112 +187,38 @@ {{end}} {{end}} - {{template "repo/issue/view_content/update_branch_by_merge" $}} - {{if .Issue.PullRequest.IsEmpty}} -
- {{svg "octicon-alert"}} - {{ctx.Locale.Tr "repo.pulls.is_empty"}} -
+
+ {{svg "octicon-alert"}} + {{ctx.Locale.Tr "repo.pulls.is_empty"}} +
{{end}} - {{if .AllowMerge}} {{/* user is allowed to merge */}} - {{if $data.MergeFormProps}} - {{$showGeneralMergeForm = true}} - {{/* The merge form is a Vue component. After mounted, it has a button for choosing merge style, so make it have min-height to avoid layout shifting */}} -
-
-
- {{else}} - {{/* no merge style was set in repo setting: not or ($prUnit.PullRequestsConfig.AllowMerge ...) */}} -
- {{svg "octicon-x"}} - {{ctx.Locale.Tr "repo.pulls.no_merge_desc"}} -
-
- {{svg "octicon-info"}} - {{ctx.Locale.Tr "repo.pulls.no_merge_helper"}} -
- {{end}} {{/* end if the repo was set to use any merge style */}} - {{else}} + {{template "repo/issue/view_content/update_branch_by_merge" (dict "MergeBoxData" $data "Issue" $.Issue)}} + + {{if not .AllowMerge}} {{/* user is allowed to merge */}} {{/* user is not allowed to merge */}}
{{svg "octicon-info"}} {{ctx.Locale.Tr "repo.pulls.no_merge_access"}}
- {{end}} {{/* end if user is allowed to merge or not */}} - {{else}} - {{/* Merge conflict without specific file. Suggest manual merge, only if all reviews and status checks OK. */}} - {{if .IsBlockedByApprovals}} -
- {{svg "octicon-x"}} - {{ctx.Locale.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .ProtectedBranch.RequiredApprovals}} -
- {{else if .IsBlockedByRejection}} -
- {{svg "octicon-x"}} - {{ctx.Locale.Tr "repo.pulls.blocked_by_rejection"}} -
- {{else if .IsBlockedByOfficialReviewRequests}} -
- {{svg "octicon-x"}} - {{ctx.Locale.Tr "repo.pulls.blocked_by_official_review_requests"}} -
- {{else if .IsBlockedByOutdatedBranch}} -
- {{svg "octicon-x"}} - {{ctx.Locale.Tr "repo.pulls.blocked_by_outdated_branch"}} -
- {{else if .IsBlockedByChangedProtectedFiles}} -
- {{svg "octicon-x"}} - {{ctx.Locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n"}} -
-
    - {{range .ChangedProtectedFiles}} -
  • {{.}}
    • - {{end}} -
- {{else if and .EnableStatusCheck (not $requiredStatusCheckState.IsSuccess)}} -
- {{svg "octicon-x"}} - {{ctx.Locale.Tr "repo.pulls.required_status_check_failed"}} -
- {{else if and .RequireSigned (not .WillSign)}} -
- {{svg "octicon-x"}} - {{ctx.Locale.Tr "repo.pulls.require_signed_wont_sign"}} -
- {{else}} -
- {{svg "octicon-x"}} - {{ctx.Locale.Tr "repo.pulls.cannot_auto_merge_desc"}} -
-
- {{svg "octicon-info"}} - {{ctx.Locale.Tr "repo.pulls.cannot_auto_merge_helper"}} -
{{end}} {{end}}{{/* end if: pull request status */}} - {{/* Manually Merged is not a well-known feature, it is used to mark a non-mergeable PR (already merged, conflicted) as merged - 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 - * Then the Manually Merged form will be shown in the merge form - */}} - {{if and $.StillCanManualMerge (not $showGeneralMergeForm)}} + {{if $data.MergeFormProps}} + {{/* The merge form is a Vue component. After mounted, it has a button for choosing merge style, so make it have min-height to avoid layout shifting */}}
-
{{/* another similar form is in PullRequestMergeForm.vue*/}} -
- -
- -
+
+
+ {{else if and .AllowMerge .Issue.PullRequest.IsStatusMergeable}} + {{/* no merge style was set in repo setting */}} +
+ {{svg "octicon-x"}} + {{ctx.Locale.Tr "repo.pulls.no_merge_desc"}} +
+
+ {{svg "octicon-info"}} + {{ctx.Locale.Tr "repo.pulls.no_merge_helper"}}
{{end}} diff --git a/templates/repo/issue/view_content/pull_merge_status_checks.tmpl b/templates/repo/issue/view_content/pull_merge_status_checks.tmpl new file mode 100644 index 00000000000..24cf9d39e10 --- /dev/null +++ b/templates/repo/issue/view_content/pull_merge_status_checks.tmpl @@ -0,0 +1,35 @@ +{{/* Template Attributes: +* CommitStatuses: all commit status elements +* StatusCheckData: additional status check data, see backend pullCommitStatusCheckData struct +*/}} +{{$commitStatuses := $.CommitStatuses}} +{{$statusCheckData := $.StatusCheckData}} +{{if $statusCheckData}} +
+
{{$statusCheckData.CommitStatusCheckPrompt ctx.Locale}}
+ +
+ + {{if $statusCheckData.RequireApprovalRunCount}} +
+
+ {{ctx.Locale.Tr "repo.pulls.status_checks_need_approvals" $statusCheckData.RequireApprovalRunCount}} +

{{ctx.Locale.Tr "repo.pulls.status_checks_need_approvals_helper"}}

+
+ {{if $statusCheckData.CanApprove}} + + {{end}} +
+ {{end}} + +
+
+ {{template "repo/pulls/status_items" (dict "CommitStatuses" $commitStatuses "StatusCheckData" $statusCheckData)}} +
+
+{{end}} diff --git a/templates/repo/issue/view_content/update_branch_by_merge.tmpl b/templates/repo/issue/view_content/update_branch_by_merge.tmpl index 940da17db19..0d2a40031ef 100644 --- a/templates/repo/issue/view_content/update_branch_by_merge.tmpl +++ b/templates/repo/issue/view_content/update_branch_by_merge.tmpl @@ -1,30 +1,30 @@ -{{if and (gt $.Issue.PullRequest.CommitsBehind 0) (not $.Issue.IsClosed) (not $.Issue.PullRequest.IsChecking) (not $.IsPullFilesConflicted) (not $.IsPullRequestBroken)}} -
-
+{{$data := $.MergeBoxData}} +{{$issue := $.Issue}} +{{if $data.ShowUpdatePullInfo}} +
+
{{svg "octicon-alert"}} {{ctx.Locale.Tr "repo.pulls.outdated_with_base_branch"}}
-
- {{if and $.UpdateAllowed $.UpdateByRebaseAllowed}} -
-
- -
- {{svg "octicon-triangle-down"}} -
- {{ctx.Locale.Tr "repo.pulls.update_branch"}} - {{ctx.Locale.Tr "repo.pulls.update_branch_rebase"}} -
+
+ {{if and $data.UpdateAllowed $data.UpdateByRebaseAllowed}} +
+ +
+ {{svg "octicon-triangle-down"}} +
+ {{ctx.Locale.Tr "repo.pulls.update_branch"}} + {{ctx.Locale.Tr "repo.pulls.update_branch_rebase"}}
{{end}} - {{if and $.UpdateAllowed (not $.UpdateByRebaseAllowed)}} -
+ {{if and $data.UpdateAllowed (not $data.UpdateByRebaseAllowed)}} + diff --git a/templates/repo/pulls/status.tmpl b/templates/repo/pulls/status.tmpl deleted file mode 100644 index 3a6c261423c..00000000000 --- a/templates/repo/pulls/status.tmpl +++ /dev/null @@ -1,63 +0,0 @@ -{{/* Template Attributes: -* CommitStatus: summary of all commit status state -* CommitStatuses: all commit status elements -* ShowHideChecks: whether use a button to show/hide the checks -* StatusCheckData: additional status check data, see backend pullCommitStatusCheckData struct -*/}} -{{$statusCheckData := .StatusCheckData}} -{{if .CommitStatus}} - {{if $statusCheckData}} -
-
{{$statusCheckData.CommitStatusCheckPrompt ctx.Locale}}
- {{if .ShowHideChecks}} - - {{end}} -
- {{end}} - {{if and $statusCheckData $statusCheckData.RequireApprovalRunCount}} -
-
- - {{ctx.Locale.Tr "repo.pulls.status_checks_need_approvals" $statusCheckData.RequireApprovalRunCount}} - -

{{ctx.Locale.Tr "repo.pulls.status_checks_need_approvals_helper"}}

-
- {{if $statusCheckData.CanApprove}} - - {{end}} -
- {{end}} - -
- {{range .CommitStatuses}} -
-
- {{template "repo/commit_status" .}} -
{{.Context}} {{.Description}}
-
-
- {{if and $statusCheckData $statusCheckData.IsContextRequired}} - {{if (call $statusCheckData.IsContextRequired .Context)}}
{{ctx.Locale.Tr "repo.pulls.status_checks_requested"}}
{{end}} - {{end}} - {{if .TargetURL}}{{ctx.Locale.Tr "repo.pulls.status_checks_details"}}{{end}} -
-
- {{end}} - {{if $statusCheckData}} - {{range $statusCheckData.MissingRequiredChecks}} -
-
- {{svg "octicon-dot-fill" 16 "commit-status icon tw-text-yellow"}} -
{{.}}
-
-
{{ctx.Locale.Tr "repo.pulls.status_checks_requested"}}
-
- {{end}} - {{end}} -
-{{end}} diff --git a/templates/repo/pulls/status_items.tmpl b/templates/repo/pulls/status_items.tmpl new file mode 100644 index 00000000000..b4f8307395e --- /dev/null +++ b/templates/repo/pulls/status_items.tmpl @@ -0,0 +1,32 @@ +{{/* Template Attributes: +* CommitStatuses: all commit status elements +* StatusCheckData: optional, additional status check data, see backend pullCommitStatusCheckData struct +*/}} +{{$statusCheckData := $.StatusCheckData}} +{{range $cs := $.CommitStatuses}} +
+
+ {{template "repo/commit_status" $cs}} +
+ {{$cs.Context}} {{$cs.Description}} +
+
+
+ {{if and $statusCheckData $statusCheckData.IsContextRequired}} + {{if (call $statusCheckData.IsContextRequired $cs.Context)}} +
{{ctx.Locale.Tr "repo.pulls.status_checks_requested"}}
+ {{end}} + {{end}} + {{if $cs.TargetURL}}{{ctx.Locale.Tr "repo.pulls.status_checks_details"}}{{end}} +
+
+{{end}} +{{range $missingCheck := $statusCheckData.MissingRequiredChecks}} +
+
+ {{svg "octicon-dot-fill" 16 "commit-status icon tw-text-yellow"}} +
{{$missingCheck}}
+
+
{{ctx.Locale.Tr "repo.pulls.status_checks_requested"}}
+
+{{end}} diff --git a/web_src/css/modules/segment.css b/web_src/css/modules/segment.css index adb514be599..7bb8a52dc86 100644 --- a/web_src/css/modules/segment.css +++ b/web_src/css/modules/segment.css @@ -179,13 +179,8 @@ margin-bottom: 1rem; } -.ui.fitted.segment:not(.horizontally) { - padding-top: 0; - padding-bottom: 0; -} -.ui.fitted.segment:not(.vertically) { - padding-left: 0; - padding-right: 0; +.ui.fitted.segment { + padding: 0; } .ui.segments .segment, diff --git a/web_src/css/repo.css b/web_src/css/repo.css index d2407c898de..f1c4678626c 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1929,6 +1929,7 @@ tbody.commit-list { max-height: 240px; /* fit exactly 6 items, commit-status-item.height * 6 */ overflow-x: hidden; transition: max-height .2s; + width: 100%; } .commit-status-item { diff --git a/web_src/css/shared/flex-list.css b/web_src/css/shared/flex-list.css index ea4314290ac..c68029697e6 100644 --- a/web_src/css/shared/flex-list.css +++ b/web_src/css/shared/flex-list.css @@ -9,7 +9,7 @@ margin: 0; } -/* items have dividers between them, the dividers align with items (use parent padding) */ +/* items have dividers between them, the dividers align with items */ .flex-divided-list, .flex-divided-list > .item.flex-divided-list { display: flex; @@ -22,6 +22,10 @@ padding: 10px 0; } +.flex-divided-list > .divider { + margin: 0; +} + .flex-divided-list > .item + .item { border-top: 1px solid var(--color-secondary); } @@ -101,21 +105,16 @@ } /* special rules to make the list work with existing UI elements */ -.container-divided > .flex-divided-list > .item { - padding-left: 1em; +.flex-divided-list.items-px-default > .item { + padding-left: 1em; /* matches ".ui.segment" padding */ padding-right: 1em; } -.container-divided > .flex-divided-list > .item.flex-divided-list { - padding: 0; -} -.container-padded > .flex-divided-list > .item:first-child, -.ui.segment:not(.container-divided) > .flex-divided-list > .item:first-child { +.ui.segment:not(.fitted) > .flex-divided-list > .item:first-child { padding-top: 0; } -.container-padded > .flex-divided-list > .item:last-child, -.ui.segment:not(.container-divided) > .flex-divided-list > .item:last-child { +.ui.segment:not(.fitted) > .flex-divided-list > .item:last-child { padding-bottom: 0; } @@ -127,7 +126,3 @@ .flex-divided-list + .divider { margin-top: 0; } - -.container-padded > .flex-divided-list + .divider { - margin-top: 10px; -} diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue index d2835fe163d..95fe0f1beb4 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -7,6 +7,8 @@ const props = defineProps<{ mergeFormProps: any, // TODO: this is a huge object, need to be refactored in the future }>(); +const mergeStyleManuallyMerged = 'manually-merged'; + const mergeForm = props.mergeFormProps; const mergeTitleFieldValue = shallowRef(''); @@ -29,10 +31,17 @@ const showMergeStyleMenu = shallowRef(false); const showActionForm = shallowRef(false); const mergeButtonStyleClass = computed(() => { + if (mergeStyle.value === mergeStyleManuallyMerged) return 'red'; if (mergeForm.allOverridableChecksOk) return 'primary'; return autoMergeWhenSucceed.value ? 'primary' : 'red'; }); +const mergeSelectStyleClass = computed(() => { + if (mergeForm.emptyCommit) return ''; + if (mergeStyle.value === mergeStyleManuallyMerged) return 'red'; + return 'primary'; +}); + const forceMerge = computed(() => { return mergeForm.canMergeNow && !mergeForm.allOverridableChecksOk; }); @@ -115,30 +124,32 @@ function clearMergeMessage() {
-
+
- +
+ - + -
- - +
+ + +
-
+