Skip to content

Refactor pull request view (3)#37439

Merged
wxiaoguang merged 5 commits into
go-gitea:mainfrom
wxiaoguang:refactor-pr-view-3
Apr 26, 2026
Merged

Refactor pull request view (3)#37439
wxiaoguang merged 5 commits into
go-gitea:mainfrom
wxiaoguang:refactor-pr-view-3

Conversation

@wxiaoguang
Copy link
Copy Markdown
Contributor

@wxiaoguang wxiaoguang commented Apr 26, 2026 •
edited
Loading

Move some complex logic to backend

Rename pr.CanAutoMerge to pr.IsStatusMergeable

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 26, 2026
@wxiaoguang wxiaoguang added type/refactoring Existing code has been cleaned up. There should be no new functionality. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Apr 26, 2026
@wxiaoguang wxiaoguang requested a review from Copilot April 26, 2026 15:58
Copilot AI reviewed Apr 26, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Refactors the pull request “merge box” rendering by moving some previously-template-based logic into backend-prepared data.

Changes:

  • Introduces a backend pullMergeBoxData struct and exposes it to templates as PullMergeBoxData.
  • Updates the merge box template to consume PullMergeBoxData (merge-box visibility, reload interval, and mergeability flags).
  • Refactors PR view preparation to reuse protected-branch rule data and adjusts signing / merge-box computations.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.

File Description
templates/repo/issue/view_content/pull_merge_box.tmpl Switches to $PullMergeBoxData for merge-box visibility and mergeability flags.
routers/web/repo/pull.go Adds pullMergeBoxData, restructures pullRequestViewInfo fields, and centralizes loading of protected-branch rule and status check data.
routers/web/repo/issue_view.go Populates MergeBoxData and moves complex merge-box conditionals from template into backend (incl. FIXME).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread routers/web/repo/pull.go
Comment thread routers/web/repo/issue_view.go Outdated
Comment thread routers/web/repo/issue_view.go Outdated
Comment thread routers/web/repo/pull.go
bircni
bircni approved these changes Apr 26, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@bircni bircni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good refactoring (how many (*) are left?

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 26, 2026
@wxiaoguang
Copy link
Copy Markdown
Contributor Author

wxiaoguang commented Apr 26, 2026

good refactoring (how many (*) are left?

No idea. Maybe 2-3 for major changes?

Although I can do everything in one PR, but it would be very difficult to review, and it might be also out of my control ( I can't guarantee that every change is on the right direction in that case)

@bircni
Copy link
Copy Markdown
Member

bircni commented Apr 26, 2026

you are right all good! I like it :-)

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 26, 2026
@wxiaoguang wxiaoguang enabled auto-merge (squash) April 26, 2026 18:43
@wxiaoguang wxiaoguang merged commit 55c9b93 into go-gitea:main Apr 26, 2026
26 checks passed
@GiteaBot GiteaBot added this to the 1.27.0 milestone Apr 26, 2026
silverwind added a commit to McMichalK/gitea that referenced this pull request Apr 26, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into filter-by-file-extension
ede430b 
* origin/main: (176 commits)
  Refactor pull request view (3) (go-gitea#37439)
  Update 1.26.1 changelog in main (go-gitea#37442)
  Make GetPossibleUserByID can handle deleted user (go-gitea#37430)
  Fix fetch action redirect (go-gitea#37437)
  Refactor integration test DecodeJSON calls to use generic return value (go-gitea#37432)
  Integrate renovate bot for all dependency updates (go-gitea#37050)
  Refactor pull request view (2) (go-gitea#37428)
  Use MarkLongPolling instead of hard-coded route path (go-gitea#37427)
  Optimize CI caches (go-gitea#37387)
  Update AGENTS.md (go-gitea#37420)
  Update Nix flake (go-gitea#37425)
  [skip ci] Updated translations via Crowdin
  remove excessive quote from terraform instructions (go-gitea#37424)
  Improve testing init, clean up webhook tests (go-gitea#37412)
  Fix color regressions, add `priority` color (go-gitea#37417)
  [skip ci] Updated translations via Crowdin
  Stabilize e2e logout propagation test (go-gitea#37403)
  refactor: serve site manifest via `/assets/site-manifest.json` endpoint (go-gitea#37405)
  feat(security): set X-Content-Type-Options: nosniff by default (go-gitea#37354)
  Refactor pull request view (1) (go-gitea#37380)
  ...

# Conflicts:
#	templates/repo/diff/box.tmpl
@wxiaoguang wxiaoguang deleted the refactor-pr-view-3 branch April 26, 2026 19:56
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 27, 2026
@zjjhot
Merge branch 'main' into mainzjj
29ce2df 
* main: (33 commits)
  refactor: use named `Permission` field in `Repository` struct instead of anonymous embedding (go-gitea#37441)
  Refactor pull request view (3) (go-gitea#37439)
  Update 1.26.1 changelog in main (go-gitea#37442)
  Make GetPossibleUserByID can handle deleted user (go-gitea#37430)
  Fix fetch action redirect (go-gitea#37437)
  Refactor integration test DecodeJSON calls to use generic return value (go-gitea#37432)
  Integrate renovate bot for all dependency updates (go-gitea#37050)
  Refactor pull request view (2) (go-gitea#37428)
  Use MarkLongPolling instead of hard-coded route path (go-gitea#37427)
  Optimize CI caches (go-gitea#37387)
  Update AGENTS.md (go-gitea#37420)
  Update Nix flake (go-gitea#37425)
  [skip ci] Updated translations via Crowdin
  remove excessive quote from terraform instructions (go-gitea#37424)
  Improve testing init, clean up webhook tests (go-gitea#37412)
  Fix color regressions, add `priority` color (go-gitea#37417)
  [skip ci] Updated translations via Crowdin
  Stabilize e2e logout propagation test (go-gitea#37403)
  refactor: serve site manifest via `/assets/site-manifest.json` endpoint (go-gitea#37405)
  feat(security): set X-Content-Type-Options: nosniff by default (go-gitea#37354)
  ...
silverwind added a commit to hanism01/gitea that referenced this pull request Apr 27, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into fix/project-board-api…
bc56ecc 
…-review-feedback

* origin/main: (144 commits)
  Add API endpoint to reply to pull request review comments (go-gitea#36683)
  Add CurrentURL template variable back (go-gitea#37444)
  refactor: use named `Permission` field in `Repository` struct instead of anonymous embedding (go-gitea#37441)
  Refactor pull request view (3) (go-gitea#37439)
  Update 1.26.1 changelog in main (go-gitea#37442)
  Make GetPossibleUserByID can handle deleted user (go-gitea#37430)
  Fix fetch action redirect (go-gitea#37437)
  Refactor integration test DecodeJSON calls to use generic return value (go-gitea#37432)
  Integrate renovate bot for all dependency updates (go-gitea#37050)
  Refactor pull request view (2) (go-gitea#37428)
  Use MarkLongPolling instead of hard-coded route path (go-gitea#37427)
  Optimize CI caches (go-gitea#37387)
  Update AGENTS.md (go-gitea#37420)
  Update Nix flake (go-gitea#37425)
  [skip ci] Updated translations via Crowdin
  remove excessive quote from terraform instructions (go-gitea#37424)
  Improve testing init, clean up webhook tests (go-gitea#37412)
  Fix color regressions, add `priority` color (go-gitea#37417)
  [skip ci] Updated translations via Crowdin
  Stabilize e2e logout propagation test (go-gitea#37403)
  ...

# Conflicts:
#	models/project/column.go
#	routers/web/repo/issue_page_meta.go
@wxiaoguang wxiaoguang mentioned this pull request May 3, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@lunny lunny lunny approved these changes

@bircni bircni bircni approved these changes

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/refactoring Existing code has been cleaned up. There should be no new functionality.

Projects

None yet

Milestone

1.27.0

Development

Successfully merging this pull request may close these issues.

5 participants

@wxiaoguang @bircni @lunny @GiteaBot