-
-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Fix duplicate script declaration error in pull request merge box #36759
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
silverwind
wants to merge
30
commits into
go-gitea:main
Choose a base branch
from
silverwind:fixmerge
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 7 commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
639d23d
Fix duplicate script declaration error in pull request merge box
silverwind c04bf2e
Suppress djlint H025 false positive in pull merge box template
silverwind f7dcbd8
Read merge form data from element props instead of window.config.page…
silverwind 6399e84
Merge remote-tracking branch 'origin/main' into fixmerge
silverwind 71501fb
Move merge form JSON construction from template to Go
silverwind 3cdf645
Apply suggestion from @silverwind
silverwind 54dc981
Merge branch 'main' into fixmerge
silverwind 83d9f38
Clean up merge form: pass params directly, remove unused code
silverwind 365689a
Simplify merge form: remove params struct, read ctx.Data directly
silverwind 66725dc
Reduce ctx.Data reads in merge form builder
silverwind db46564
Remove ctx.Data reads: pass values through typed params
silverwind 4811c47
Remove obsolete ctx.Data sets and simplify merge style logic
silverwind 6170a80
Remove ctx.Data round-trips in prepareViewPullInfo
silverwind 1509ca3
DRY up merge form: embed struct, inline closure, deduplicate checks
silverwind 1268eec
Pass pre-computed blocked-by flags to merge form builder
silverwind 1898288
Add e2e tests for pull request merge box
silverwind ad0c12c
Optimize pull merge box e2e tests
silverwind b059455
Shorten e2e test names and use lowercase
silverwind 33e154a
Remove redundant recovery check in status checks e2e test
silverwind 96e8b2a
fix lint
silverwind 93fae30
Fix type assertion panic when HeadTarget is template.HTML
silverwind 4e72424
Remove unused apiCreateFile and extract preparePullViewReviewAndMergeAll
silverwind ff3e554
Remove unused clickDropdownItem utility function
silverwind 885897b
Merge branch 'main' into fixmerge
silverwind a826a20
Add comments explaining merge permission logic
silverwind 3e02cd4
Restore stillCanManualMerge closure
silverwind 5ff665d
Rename merge form fields for clarity
silverwind f626aa0
Merge remote-tracking branch 'origin/main' into fixmerge
silverwind 0affa9c
fmt
silverwind 3d66fd3
Merge origin/main into fixmerge
silverwind File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,214 @@ | ||
| // Copyright 2026 The Gitea Authors. All rights reserved. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| package repo | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| git_model "code.gitea.io/gitea/models/git" | ||
| issues_model "code.gitea.io/gitea/models/issues" | ||
| pull_model "code.gitea.io/gitea/models/pull" | ||
| repo_model "code.gitea.io/gitea/models/repo" | ||
| "code.gitea.io/gitea/models/unit" | ||
| "code.gitea.io/gitea/modules/json" | ||
| "code.gitea.io/gitea/modules/templates" | ||
| "code.gitea.io/gitea/services/context" | ||
| ) | ||
|
|
||
| type mergeStyleField struct { | ||
| Name string `json:"name"` | ||
| Allowed bool `json:"allowed"` | ||
| TextDoMerge string `json:"textDoMerge"` | ||
| MergeTitleFieldText string `json:"mergeTitleFieldText,omitempty"` | ||
| MergeMessageFieldText string `json:"mergeMessageFieldText,omitempty"` | ||
| HideMergeMessageTexts bool `json:"hideMergeMessageTexts,omitempty"` | ||
| HideAutoMerge bool `json:"hideAutoMerge"` | ||
| } | ||
|
|
||
| type mergeFormField struct { | ||
| BaseLink string `json:"baseLink"` | ||
| TextCancel string `json:"textCancel"` | ||
| TextDeleteBranch string `json:"textDeleteBranch"` | ||
| TextAutoMergeButtonWhenSucceed string `json:"textAutoMergeButtonWhenSucceed"` | ||
| TextAutoMergeWhenSucceed string `json:"textAutoMergeWhenSucceed"` | ||
| TextAutoMergeCancelSchedule string `json:"textAutoMergeCancelSchedule"` | ||
| TextClearMergeMessage string `json:"textClearMergeMessage"` | ||
| TextClearMergeMessageHint string `json:"textClearMergeMessageHint"` | ||
| TextMergeCommitID string `json:"textMergeCommitId"` | ||
| CanMergeNow bool `json:"canMergeNow"` | ||
| AllOverridableChecksOk bool `json:"allOverridableChecksOk"` | ||
| EmptyCommit bool `json:"emptyCommit"` | ||
| PullHeadCommitID string `json:"pullHeadCommitID"` | ||
| IsPullBranchDeletable bool `json:"isPullBranchDeletable"` | ||
| DefaultMergeStyle string `json:"defaultMergeStyle"` | ||
| DefaultDeleteBranchAfterMerge bool `json:"defaultDeleteBranchAfterMerge"` | ||
| MergeMessageFieldPlaceHolder string `json:"mergeMessageFieldPlaceHolder"` | ||
| DefaultMergeMessage string `json:"defaultMergeMessage"` | ||
| HasPendingPullRequestMerge bool `json:"hasPendingPullRequestMerge"` | ||
| HasPendingPullRequestMergeTip string `json:"hasPendingPullRequestMergeTip"` | ||
| MergeStyles []mergeStyleField `json:"mergeStyles"` | ||
| } | ||
|
|
||
| // preparePullViewMergeFormData builds the JSON data for the merge form Vue component. | ||
| // It must be called after preparePullViewReviewAndMerge so all necessary ctx.Data values exist. | ||
| func preparePullViewMergeFormData(ctx *context.Context, issue *issues_model.Issue) { | ||
| if !issue.IsPull { | ||
| return | ||
| } | ||
| pull := issue.PullRequest | ||
|
|
||
| if pull.HasMerged || issue.IsClosed { | ||
| return | ||
| } | ||
|
|
||
| // The merge form is only shown when CanAutoMerge or IsEmpty | ||
| if !pull.CanAutoMerge() && !pull.IsEmpty() { | ||
| return | ||
| } | ||
|
|
||
| allowMerge, _ := ctx.Data["AllowMerge"].(bool) | ||
| if !allowMerge { | ||
| return | ||
| } | ||
|
|
||
| prUnit, err := issue.Repo.GetUnit(ctx, unit.TypePullRequests) | ||
| if err != nil { | ||
| return | ||
| } | ||
| prConfig := prUnit.PullRequestsConfig() | ||
|
|
||
| if !(prConfig.AllowMerge || prConfig.AllowRebase || prConfig.AllowRebaseMerge || prConfig.AllowSquash || prConfig.AllowFastForwardOnly) { | ||
| return | ||
| } | ||
|
|
||
| // Compute notAllOverridableChecksOk (same logic as template) | ||
| isBlockedByApprovals, _ := ctx.Data["IsBlockedByApprovals"].(bool) | ||
| isBlockedByRejection, _ := ctx.Data["IsBlockedByRejection"].(bool) | ||
| isBlockedByOfficialReviewRequests, _ := ctx.Data["IsBlockedByOfficialReviewRequests"].(bool) | ||
| isBlockedByOutdatedBranch, _ := ctx.Data["IsBlockedByOutdatedBranch"].(bool) | ||
| isBlockedByChangedProtectedFiles, _ := ctx.Data["IsBlockedByChangedProtectedFiles"].(bool) | ||
| enableStatusCheck, _ := ctx.Data["EnableStatusCheck"].(bool) | ||
|
|
||
| requiredStatusCheckSuccess := false | ||
| if statusCheckData, ok := ctx.Data["StatusCheckData"].(*pullCommitStatusCheckData); ok && statusCheckData != nil { | ||
| requiredStatusCheckSuccess = statusCheckData.RequiredChecksState.IsSuccess() | ||
| } | ||
|
|
||
| notAllOverridableChecksOk := isBlockedByApprovals || isBlockedByRejection || | ||
| isBlockedByOfficialReviewRequests || isBlockedByOutdatedBranch || | ||
| isBlockedByChangedProtectedFiles || (enableStatusCheck && !requiredStatusCheckSuccess) | ||
|
|
||
| // Compute canMergeNow (same logic as template) | ||
| isRepoAdmin := ctx.IsSigned && (ctx.Repo.IsAdmin() || ctx.Doer.IsAdmin) | ||
| blockAdminMergeOverride := false | ||
| if pb, ok := ctx.Data["ProtectedBranch"].(*git_model.ProtectedBranch); ok && pb != nil { | ||
| blockAdminMergeOverride = pb.BlockAdminMergeOverride | ||
| } | ||
| requireSigned, _ := ctx.Data["RequireSigned"].(bool) | ||
| willSign, _ := ctx.Data["WillSign"].(bool) | ||
|
|
||
| canMergeNow := ((!blockAdminMergeOverride && isRepoAdmin) || !notAllOverridableChecksOk) && | ||
| (!allowMerge || !requireSigned || willSign) | ||
|
|
||
| generalHideAutoMerge := canMergeNow && !notAllOverridableChecksOk | ||
|
|
||
| // Build hasPendingPullRequestMergeTip | ||
| hasPendingPullRequestMerge, _ := ctx.Data["HasPendingPullRequestMerge"].(bool) | ||
| hasPendingPullRequestMergeTip := "" | ||
| if hasPendingPullRequestMerge { | ||
| if pendingMerge, ok := ctx.Data["PendingPullRequestMerge"].(*pull_model.AutoMerge); ok && pendingMerge != nil { | ||
| createdPRMergeStr := templates.TimeSince(pendingMerge.CreatedUnix) | ||
| hasPendingPullRequestMergeTip = string(ctx.Locale.Tr("repo.pulls.auto_merge_has_pending_schedule", pendingMerge.Doer.Name, createdPRMergeStr)) | ||
| } | ||
| } | ||
|
|
||
| // Get values from ctx.Data | ||
| mergeStyle, _ := ctx.Data["MergeStyle"].(repo_model.MergeStyle) | ||
| defaultMergeMessage, _ := ctx.Data["DefaultMergeMessage"].(string) | ||
| defaultMergeBody, _ := ctx.Data["DefaultMergeBody"].(string) | ||
| defaultSquashMergeMessage, _ := ctx.Data["DefaultSquashMergeMessage"].(string) | ||
| defaultSquashMergeBody, _ := ctx.Data["DefaultSquashMergeBody"].(string) | ||
| pullHeadCommitID, _ := ctx.Data["PullHeadCommitID"].(string) | ||
| isPullBranchDeletable, _ := ctx.Data["IsPullBranchDeletable"].(bool) | ||
| headTarget, _ := ctx.Data["HeadTarget"].(string) | ||
| getCommitMessages, _ := ctx.Data["GetCommitMessages"].(string) | ||
|
|
||
| form := &mergeFormField{ | ||
| BaseLink: issue.Link(), | ||
| TextCancel: string(ctx.Locale.Tr("cancel")), | ||
| TextDeleteBranch: string(ctx.Locale.Tr("repo.branch.delete", headTarget)), | ||
| TextAutoMergeButtonWhenSucceed: string(ctx.Locale.Tr("repo.pulls.auto_merge_button_when_succeed")), | ||
| TextAutoMergeWhenSucceed: string(ctx.Locale.Tr("repo.pulls.auto_merge_when_succeed")), | ||
| TextAutoMergeCancelSchedule: string(ctx.Locale.Tr("repo.pulls.auto_merge_cancel_schedule")), | ||
| TextClearMergeMessage: string(ctx.Locale.Tr("repo.pulls.clear_merge_message")), | ||
| TextClearMergeMessageHint: string(ctx.Locale.Tr("repo.pulls.clear_merge_message_hint")), | ||
| TextMergeCommitID: string(ctx.Locale.Tr("repo.pulls.merge_commit_id")), | ||
| CanMergeNow: canMergeNow, | ||
| AllOverridableChecksOk: !notAllOverridableChecksOk, | ||
| EmptyCommit: pull.IsEmpty(), | ||
| PullHeadCommitID: pullHeadCommitID, | ||
| IsPullBranchDeletable: isPullBranchDeletable, | ||
| DefaultMergeStyle: string(mergeStyle), | ||
| DefaultDeleteBranchAfterMerge: prConfig.DefaultDeleteBranchAfterMerge, | ||
| MergeMessageFieldPlaceHolder: string(ctx.Locale.Tr("repo.editor.commit_message_desc")), | ||
| DefaultMergeMessage: defaultMergeBody, | ||
| HasPendingPullRequestMerge: hasPendingPullRequestMerge, | ||
| HasPendingPullRequestMergeTip: hasPendingPullRequestMergeTip, | ||
| MergeStyles: []mergeStyleField{ | ||
| { | ||
| Name: "merge", | ||
| Allowed: prConfig.AllowMerge, | ||
| TextDoMerge: string(ctx.Locale.Tr("repo.pulls.merge_pull_request")), | ||
| MergeTitleFieldText: defaultMergeMessage, | ||
| MergeMessageFieldText: defaultMergeBody, | ||
| HideAutoMerge: generalHideAutoMerge, | ||
| }, | ||
| { | ||
| Name: "rebase", | ||
| Allowed: prConfig.AllowRebase, | ||
| TextDoMerge: string(ctx.Locale.Tr("repo.pulls.rebase_merge_pull_request")), | ||
| HideMergeMessageTexts: true, | ||
| HideAutoMerge: generalHideAutoMerge, | ||
| }, | ||
| { | ||
| Name: "rebase-merge", | ||
| Allowed: prConfig.AllowRebaseMerge, | ||
| TextDoMerge: string(ctx.Locale.Tr("repo.pulls.rebase_merge_commit_pull_request")), | ||
| MergeTitleFieldText: defaultMergeMessage, | ||
| MergeMessageFieldText: defaultMergeBody, | ||
| HideAutoMerge: generalHideAutoMerge, | ||
| }, | ||
| { | ||
| Name: "squash", | ||
| Allowed: prConfig.AllowSquash, | ||
| TextDoMerge: string(ctx.Locale.Tr("repo.pulls.squash_merge_pull_request")), | ||
| MergeTitleFieldText: defaultSquashMergeMessage, | ||
| MergeMessageFieldText: fmt.Sprintf("%s%s", getCommitMessages, defaultSquashMergeBody), | ||
| HideAutoMerge: generalHideAutoMerge, | ||
| }, | ||
| { | ||
| Name: "fast-forward-only", | ||
| Allowed: prConfig.AllowFastForwardOnly && pull.CommitsBehind == 0, | ||
| TextDoMerge: string(ctx.Locale.Tr("repo.pulls.fast_forward_only_merge_pull_request")), | ||
| HideMergeMessageTexts: true, | ||
| HideAutoMerge: generalHideAutoMerge, | ||
| }, | ||
| { | ||
| Name: "manually-merged", | ||
| Allowed: prConfig.AllowManualMerge, | ||
| TextDoMerge: string(ctx.Locale.Tr("repo.pulls.merge_manually")), | ||
| HideMergeMessageTexts: true, | ||
| HideAutoMerge: true, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| jsonBytes, err := json.Marshal(form) | ||
| if err != nil { | ||
| ctx.ServerError("json.Marshal", err) | ||
| return | ||
| } | ||
| ctx.Data["MergeFormJSON"] = string(jsonBytes) | ||
| ctx.Data["ShowGeneralMergeForm"] = true | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.