Skip to content

Conversation

@brymut
Copy link
Contributor

@brymut brymut commented Nov 30, 2025

Resolves #35994

Do not render code expansion arrows when DiffBlobExcerptData is not available (code file preview, pull conversation diff comment).

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 30, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Nov 30, 2025
@brymut brymut marked this pull request as ready for review November 30, 2025 15:08
@wxiaoguang
Copy link
Contributor

Although it "fixes" (no panic), but I don't think the fix is right.

DiffBlobExcerptData is never used in this context.

The rendered conversation should have no "blob excerpt expand button".

@wxiaoguang
Copy link
Contributor

The fix should be:

- {{if $.root.AfterCommitID}}
+ {{if $diffBlobExcerptData}}

And update the comments accordingly:

image

@lunny lunny added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Nov 30, 2025
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label Dec 3, 2025
@brymut brymut force-pushed the fix/include-diffBlobExcerptData-in-pull-conv branch from 58f7ae5 to 3e4f434 Compare December 3, 2025 14:51
@github-actions github-actions bot removed the modifies/go Pull requests that update Go code label Dec 3, 2025
@brymut
Copy link
Contributor Author

brymut commented Dec 3, 2025

Apologies to the delay, updated

@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 Dec 3, 2025
Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>
@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 Dec 3, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 4, 2025
@wxiaoguang wxiaoguang removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 4, 2025
@wxiaoguang wxiaoguang marked this pull request as draft December 4, 2025 00:49
@wxiaoguang
Copy link
Contributor

The title and description need to be updated

@brymut brymut changed the title fix: add diff blob excerpt data to pull review context fix: Exclude code expansion arrows when DiffBlobExcerptData is not available. Dec 4, 2025
@brymut
Copy link
Contributor Author

brymut commented Dec 4, 2025

The title and description need to be updated

done

@wxiaoguang wxiaoguang marked this pull request as ready for review December 4, 2025 15:33
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 5, 2025
@lunny lunny merged commit 6675ddc into go-gitea:main Dec 5, 2025
23 checks passed
@GiteaBot GiteaBot added this to the 1.26.0 milestone Dec 5, 2025
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 5, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 6, 2025
* giteaofficial/main:
  Disable matchBrackets in monaco (go-gitea#36089)
  Update JS deps (go-gitea#36091)
  fix: Exclude code expansion arrows when DiffBlobExcerptData is not available. (go-gitea#36060)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/templates This PR modifies the template files skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Replying a code review results in 500

5 participants