Refactor pull request view (6)#37522
Merged
wxiaoguang merged 2 commits intogo-gitea:mainfrom May 4, 2026
Merged
Conversation
Contributor
Author
0b1edb0 to
9d14352
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR continues the pull request view refactor by moving more merge-box state/decision logic to the backend and consolidating PR status/merge UI templates around reusable components.
Changes:
- Moves PR timeline icon color selection and some merge-box state into backend-prepared data.
- Replaces legacy/manual merge-box branches with the Vue merge form and shared status-check partials.
- Simplifies flex-list/segment styling to support the refactored PR merge/status layouts.
Reviewed changes
Copilot reviewed 16 out of 16 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 |
Keeps PR update action logic, only adds a TODO about non-JSON responses. |
web_src/js/components/PullRequestMergeForm.vue |
Adjusts merge button coloring/layout and keeps all merge actions in the Vue form. |
web_src/css/shared/flex-list.css |
Refactors divided-list padding/divider helpers around items-px-default. |
web_src/css/repo.css |
Tweaks commit-status list sizing. |
web_src/css/modules/segment.css |
Simplifies fitted segment padding rules. |
templates/repo/pulls/status_items.tmpl |
Extracts reusable commit-status item rendering. |
templates/repo/pulls/status.tmpl |
Removes the old monolithic status template. |
templates/repo/issue/view_content/update_branch_by_merge.tmpl |
Reworks update-branch block to use merge-box data. |
templates/repo/issue/view_content/pull_merge_status_checks.tmpl |
Adds a new merge-box partial for status checks and approvals. |
templates/repo/issue/view_content/pull_merge_box.tmpl |
Rewrites the PR merge box to use backend data and new partials/components. |
templates/repo/commit_statuses.tmpl |
Reuses the new shared status item partial in commit-status popovers. |
templates/devtest/flex-list.tmpl |
Updates examples to the new flex-list padding model. |
routers/web/repo/pull_merge_form.go |
Backend-prepares merge form props/styles, including manual merge handling. |
routers/web/repo/pull_merge_box.go |
Adds backend logic for timeline icon coloring. |
routers/web/repo/pull.go |
Extends merge-box/view structs with backend-prepared fields. |
routers/web/repo/issue_view.go |
Populates merge-box data and invokes the new backend helpers. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
9d14352 to
bbc6613
Compare
lunny
approved these changes
May 4, 2026
bircni
approved these changes
May 4, 2026
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.




Clean up legacy logic.