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

Refactor template empty checks #28351

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Refactor template empty checks #28351

merged 1 commit into from
Dec 4, 2023

Conversation

KN4CK3R
Copy link
Member

@KN4CK3R KN4CK3R commented Dec 4, 2023

Fix #28347

As there is no info how to reproduce it, I can't test it.
Fix may be section_split.tmpl @ 126/130.

Other changes are "empty check" refactorings.

@KN4CK3R KN4CK3R added type/bug type/refactoring Existing code has been cleaned up. There should be no new functionality. labels Dec 4, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 4, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 4, 2023
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label Dec 4, 2023
@KN4CK3R KN4CK3R mentioned this pull request Dec 4, 2023
Closed
delvh
delvh reviewed Dec 4, 2023
View reviewed changes
templates/repo/diff/section_split.tmpl
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
{{end}}
{{if eq $line.GetCommentSide "previous"}}
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
Copy link
Member

Choose a reason for hiding this comment

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

Doesn't this panic when not $line.Comments?

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed the check because it is already in line 139.

@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 4, 2023
@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 4, 2023
@jolheiser jolheiser merged commit b3c2588 into go-gitea:main Dec 4, 2023
25 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Dec 4, 2023
@KN4CK3R KN4CK3R added the backport/v1.21 This PR should be backported to Gitea 1.21 label Dec 4, 2023
@KN4CK3R KN4CK3R deleted the fix-28347 branch December 4, 2023 22:08
@GiteaBot GiteaBot mentioned this pull request Dec 5, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Dec 5, 2023
@KN4CK3R @GiteaBot
Refactor template empty checks (go-gitea#28351)
1e41f92
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Dec 5, 2023
pangliang pushed a commit to pangliang/gitea that referenced this pull request Dec 5, 2023
@KN4CK3R @pangliang
Refactor template empty checks (go-gitea#28351)
c9c6151
lunny pushed a commit that referenced this pull request Dec 5, 2023
@GiteaBot @KN4CK3R
Refactor template empty checks (#28351) (#28354)
08445d5 
Backport #28351 by @KN4CK3R

Fix #28347

As there is no info how to reproduce it, I can't test it.
Fix may be `section_split.tmpl @ 126/130`.

Other changes are "empty check" refactorings.

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 5, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
8fcd936 
* giteaofficial/main:
  Convert git commit summary to valid UTF8. (go-gitea#28356)
  Fix RPM/Debian signature key creation (go-gitea#28352)
  Refactor template empty checks (go-gitea#28351)
fuxiaohei pushed a commit to fuxiaohei/gitea that referenced this pull request Jan 17, 2024
@KN4CK3R @fuxiaohei
Refactor template empty checks (go-gitea#28351)
09a9d3c
@Menah3m Menah3m mentioned this pull request Feb 6, 2024
Closed
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
@KN4CK3R @silverwind
Refactor template empty checks (go-gitea#28351)
182861c
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Mar 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@jolheiser jolheiser jolheiser approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created 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/templates This PR modifies the template files size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Failed to add comment to a PR - slice out of range
4 participants
@KN4CK3R @jolheiser @delvh @GiteaBot