Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix template error when comment review doesn't exist #29888

Merged
merged 3 commits into from
Mar 19, 2024
Merged

Fix template error when comment review doesn't exist #29888

merged 3 commits into from
Mar 19, 2024

Conversation

wxiaoguang
Copy link
Contributor

Fix #29885

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 18, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 18, 2024
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label Mar 18, 2024
@wxiaoguang
Copy link
Contributor Author

wxiaoguang commented Mar 18, 2024 •
edited
Loading

This is a quick and dirty fix for the 500 panic error.

The root problem is that the "review" could be delete, leaving the "comment" has a dangling Review field.

I did some manual tests, it does resolve the 500 panic error.

Compare by ignoring spaces: https://github.com/go-gitea/gitea/pull/29888/files?diff=unified&w=1

And added some tests (they fail on main branch):

image

image

@wxiaoguang wxiaoguang mentioned this pull request Mar 18, 2024
Closed
@wxiaoguang wxiaoguang added the backport/v1.21 This PR should be backported to Gitea 1.21 label Mar 18, 2024
@wxiaoguang wxiaoguang mentioned this pull request Mar 18, 2024
Merged
@wxiaoguang wxiaoguang mentioned this pull request Mar 18, 2024
Merged
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 18, 2024
@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 Mar 18, 2024
@wxiaoguang wxiaoguang mentioned this pull request Mar 18, 2024
Closed
@wxiaoguang wxiaoguang added backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! labels Mar 18, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Mar 18, 2024
@wxiaoguang wxiaoguang force-pushed the fix-comment-review branch 2 times, most recently from abd6f26 to b4a3f2a Compare March 18, 2024 17:46
@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 Mar 19, 2024
@lunny lunny enabled auto-merge (squash) March 19, 2024 03:42
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 19, 2024
@lunny lunny merged commit 828701f into go-gitea:main Mar 19, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Mar 19, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 19, 2024
@wxiaoguang wxiaoguang deleted the fix-comment-review branch March 19, 2024 06:51
lunny pushed a commit that referenced this pull request Mar 19, 2024
@wxiaoguang
Fix template error when comment review doesn't exist (#29888) (#29889)
b9dd5dd 
Backport #29888
@wxiaoguang wxiaoguang mentioned this pull request Mar 20, 2024
Closed
@lunny lunny modified the milestones: 1.23.0, 1.22.0 Mar 22, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Render failed when opening PR with conversation
4 participants
@wxiaoguang @lunny @silverwind @GiteaBot