Skip to content

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Jun 9, 2023

Backport clean cherry-picks of #25133 and #25162 to 1.20.

yp05327 and others added 2 commits June 9, 2023 12:43
…25133)

Fixes go-gitea#25130

The old code uses `$(this).next()` to get `dismiss-review-modal`.
At first, it will get `$(#dismiss-review-modal)`, but the next time it
will get `$(#dismiss-review-modal).next();`
and then `$(#dismiss-review-modal).next().next();`.
Because div `dismiss-review-modal` will be removed when
`dismiss-review-btn` clicked.

Maybe the right usage is adding `show-modal` class and `data-modal`
attribute.
Fix go-gitea#25133

Thanks @wxiaoguang @silverwind.
I'm sorry I made a mistake, it will be fixed in this PR.

---------

Co-authored-by: Giteabot <[email protected]>
Co-authored-by: silverwind <[email protected]>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 9, 2023
@GiteaBot GiteaBot added this to the 1.20.0 milestone Jun 9, 2023
@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 Jun 9, 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 Jun 10, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 11, 2023
@lunny lunny enabled auto-merge (squash) June 11, 2023 01:50
@lunny lunny merged commit 224ee0d into go-gitea:release/v1.20 Jun 11, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 11, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 9, 2023
@wxiaoguang wxiaoguang deleted the backport-25133 branch January 26, 2025 16:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants