-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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.
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
Fix rendering assignee changed comments without assignee #27927
Merged
Merged
Conversation
This file contains 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
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Nov 6, 2023
pull-request-size
bot
added
the
size/M
Denotes a PR that changes 30-99 lines, ignoring generated files.
label
Nov 6, 2023
github-actions
bot
added
the
modifies/templates
This PR modifies the template files
label
Nov 6, 2023
invliD
commented
Nov 6, 2023
<div class="timeline-item event" id="{{.HashTag}}"> | ||
<span class="badge">{{svg "octicon-person"}}</span> | ||
{{if gt .AssigneeID 0}} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I only removed this line (and its corresponding {{end}}
) in this hunk; the rest is just whitespace change.
delvh
approved these changes
Nov 6, 2023
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
Nov 6, 2023
silverwind
approved these changes
Nov 7, 2023
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
Nov 7, 2023
silverwind
added
backport/v1.21
This PR should be backported to Gitea 1.21
type/bug
labels
Nov 7, 2023
lunny
added
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Nov 7, 2023
GiteaBot
removed
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Nov 7, 2023
GiteaBot
added a commit
to GiteaBot/gitea
that referenced
this pull request
Nov 7, 2023
) When an assignee changed event comment is rendered, most of it is guarded behind the assignee ID not being 0. However, if it is 0, that results in quite broken rendering for that comment and the next one. This can happen, for example, when repository data imported from outside of Gitea is incomplete. This PR makes sure comments with an assignee ID of 0 are not rendered at all. --- Screenshot before: <img width="272" alt="Bildschirmfoto 2023-11-05 um 20 12 18" src="https://github.com/go-gitea/gitea/assets/42910/7d629d76-fee4-4fe5-9e3a-bf524050cead"> The comments in this screenshot are: 1. A regular text comment 2. A user being unassigned 3. A user being assigned 4. The title of the PR being changed Comments 2 and 3 are rendered without any text, which indents the next comment and does not leave enough vertical space. Co-authored-by: Giteabot <teabot@gitea.io>
KN4CK3R
pushed a commit
that referenced
this pull request
Nov 7, 2023
…7952) Backport #27927 by @invliD When an assignee changed event comment is rendered, most of it is guarded behind the assignee ID not being 0. However, if it is 0, that results in quite broken rendering for that comment and the next one. This can happen, for example, when repository data imported from outside of Gitea is incomplete. This PR makes sure comments with an assignee ID of 0 are not rendered at all. --- Screenshot before: <img width="272" alt="Bildschirmfoto 2023-11-05 um 20 12 18" src="https://github.com/go-gitea/gitea/assets/42910/7d629d76-fee4-4fe5-9e3a-bf524050cead"> The comments in this screenshot are: 1. A regular text comment 2. A user being unassigned 3. A user being assigned 4. The title of the PR being changed Comments 2 and 3 are rendered without any text, which indents the next comment and does not leave enough vertical space. Co-authored-by: Sebastian Brückner <code@nik.dev>
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Nov 8, 2023
* giteaofficial/main: Fix citation error when the file size is larger than 1024 bytes (go-gitea#27958) Use flex-container on user dashboard (go-gitea#27956) Document REACTION_MAX_USER_NUM setting option (go-gitea#27954) Add word-break to repo description in home page (go-gitea#27924) Remove go versions from .golangci.yml (go-gitea#27953) Fix the overflow style for "Hide all checks" (go-gitea#27932) Fix rendering assignee changed comments without assignee (go-gitea#27927) Add word break to release title (go-gitea#27942)
fuxiaohei
pushed a commit
to fuxiaohei/gitea
that referenced
this pull request
Jan 17, 2024
) When an assignee changed event comment is rendered, most of it is guarded behind the assignee ID not being 0. However, if it is 0, that results in quite broken rendering for that comment and the next one. This can happen, for example, when repository data imported from outside of Gitea is incomplete. This PR makes sure comments with an assignee ID of 0 are not rendered at all. --- Screenshot before: <img width="272" alt="Bildschirmfoto 2023-11-05 um 20 12 18" src="https://github.com/go-gitea/gitea/assets/42910/7d629d76-fee4-4fe5-9e3a-bf524050cead"> The comments in this screenshot are: 1. A regular text comment 2. A user being unassigned 3. A user being assigned 4. The title of the PR being changed Comments 2 and 3 are rendered without any text, which indents the next comment and does not leave enough vertical space. Co-authored-by: Giteabot <teabot@gitea.io>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
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.
When an assignee changed event comment is rendered, most of it is guarded behind the assignee ID not being 0. However, if it is 0, that results in quite broken rendering for that comment and the next one. This can happen, for example, when repository data imported from outside of Gitea is incomplete.
This PR makes sure comments with an assignee ID of 0 are not rendered at all.
Screenshot before:
The comments in this screenshot are:
Comments 2 and 3 are rendered without any text, which indents the next comment and does not leave enough vertical space.