Refactor pull request view (4)#37451
Merged
silverwind merged 4 commits intogo-gitea:mainfrom Apr 28, 2026
Merged
Conversation
GiteaBot
added
the
lgtm/need 2
wxiaoguang
force-pushed
the
refactor-pr-view-4
branch
from
3c17ca1 to
d579092
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Refactors the pull request merge box to stop relying on inline <script type="module"> for populating merge-form data, and instead passes the merge form’s initial state via a JSON-encoded HTML attribute into the Vue component.
Changes:
- Replace inline script-based merge-form data injection with a
data-merge-form-propsJSON attribute consumed byPullRequestMergeForm.vue. - Move merge-form props construction into a dedicated backend helper (
prepareMergeBoxFormProps) and store it inPullMergeBoxData. - Adjust templates to use the new merge-box data structure for conditional rendering of pull command instructions.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| web_src/js/features/repo-issue-pull.ts | Parses merge-form props JSON from DOM and mounts Vue component; removes dynamic script execution on merge-box reload. |
| web_src/js/components/PullRequestMergeForm.vue | Switches merge-form data source from window.config.pageData to passed-in Vue props. |
| templates/repo/issue/view_content/pull_merge_instruction.tmpl | Reads ShowMergeInstructions via MergeBoxData instead of a direct template variable. |
| templates/repo/issue/view_content/pull_merge_box.tmpl | Replaces inline script with data-merge-form-props attribute and updates instruction template invocation. |
| routers/web/repo/pull_merge_form.go | New backend helper to build the merge form props payload and attach it to merge-box data. |
| routers/web/repo/pull.go | Refactors head-target display computation into pullRequestViewInfo while keeping template data intact. |
| routers/web/repo/issue_view.go | Moves merge-form related data preparation into PullMergeBoxData and invokes the new merge-form props builder. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
wxiaoguang
force-pushed
the
refactor-pr-view-4
branch
from
d579092 to
e069df3
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
wxiaoguang
force-pushed
the
refactor-pr-view-4
branch
from
e069df3 to
fa2ff5f
Compare
lunny
added
the
type/refactoring
lunny
approved these changes
Apr 27, 2026
GiteaBot
added
lgtm/need 1
bircni
approved these changes
Apr 27, 2026
GiteaBot
added
lgtm/done
silverwind
added
reviewed/wait-merge
silverwind
reviewed
Apr 27, 2026
Member
|
#37451 (comment) seems like a real regression, recommend not merging until fixed. |
silverwind
requested changes
Apr 28, 2026
GiteaBot
added
lgtm/blocked
Contributor
Author
Typo, fixed in 0a5ee25 |
silverwind
approved these changes
Apr 28, 2026
GiteaBot
added
lgtm/done
silverwind
added
the
reviewed/wait-merge
GiteaBot
removed
the
reviewed/wait-merge
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Apr 29, 2026
* main: Add DEFAULT_TITLE_SOURCE setting for pull request title default behavior (go-gitea#37465) Fix compare dropdown for branches without common history (go-gitea#37470) FIX: URL sanitization to handle schemeless credentials (go-gitea#37440) Refactor pull request view (4) (go-gitea#37451) Fix scheduled action panic with null event payload (go-gitea#37459) Fix attachment Content-Security-Policy (go-gitea#37455) [skip ci] Updated translations via Crowdin Rename CurrentRefPath to CurrentRefSubURL (go-gitea#37453) Clean up org pages layout (go-gitea#37445) Fix script error alert (go-gitea#37458) Fix inconsistent disabled styling on logged-out repo header buttons (go-gitea#37406) Add API endpoint to reply to pull request review comments (go-gitea#36683) Add CurrentURL template variable back (go-gitea#37444)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Use JSON attribute instead of inline script