Skip to content

Fix #25133 #25162

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
Merged
merged 5 commits into from
Jun 9, 2023
Merged

Fix #25133 #25162

merged 5 commits into from
Jun 9, 2023

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Jun 9, 2023

Fix #25133

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

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 9, 2023
@yp05327 yp05327 requested review from silverwind and wxiaoguang June 9, 2023 00:35
wxiaoguang
wxiaoguang approved these changes Jun 9, 2023
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

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

Never mind, thank you very much!

And .... a small question, what does data-review-id="dismiss-review-{{.Review.ID}}" do here?

@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 9, 2023
@techknowlogick techknowlogick added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/v1.20 This PR should be backported to Gitea 1.20 labels Jun 9, 2023
@silverwind silverwind mentioned this pull request Jun 9, 2023
Closed
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 9, 2023
@silverwind
Copy link
Member

silverwind commented Jun 9, 2023 •
edited
Loading

Never mind, thank you very much!

And .... a small question, what does data-review-id="dismiss-review-{{.Review.ID}}" do here?

Seems like a unnecessary attribute to me, could not find anything when searching review-id in the codebase except this place.

@silverwind silverwind removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 9, 2023
@silverwind
Copy link
Member

I traced back data-review-id to ac70163 and there is no code that uses it, so I've removed it.

@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 9, 2023
@silverwind silverwind enabled auto-merge (squash) June 9, 2023 09:22
@silverwind silverwind merged commit 81211db into go-gitea:main Jun 9, 2023
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jun 9, 2023
@GiteaBot
Copy link
Collaborator

GiteaBot commented Jun 9, 2023

I was unable to create a backport for 1.20. @yp05327, please send one manually. 🍵

go run ./contrib/backport 25162
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jun 9, 2023
silverwind added a commit to silverwind/gitea that referenced this pull request Jun 9, 2023
@yp05327 @GiteaBot @silverwind
Fix go-gitea#25133 (go-gitea#25162)
40a5348 
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 <teabot@gitea.io>
Co-authored-by: silverwind <me@silverwind.io>
@silverwind silverwind mentioned this pull request Jun 9, 2023
Merged
@silverwind
Copy link
Member

#25172 contains this backport.

@yardenshoham yardenshoham added the backport/done All backports for this PR have been created label Jun 9, 2023
lunny pushed a commit that referenced this pull request Jun 11, 2023
@silverwind
Fix strange UI behavior of cancelling dismiss review modal (#25172)
224ee0d 
Backport clean cherry-picks of
#25133 and
#25162 to 1.20.
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 12, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
1fa6c06 
* upstream/main:
  [skip ci] Updated licenses and gitignores
  Add `WithPullRequest` for `actionsNotifier` (go-gitea#25144)
  [skip ci] Updated translations via Crowdin
  [skip ci] Updated translations via Crowdin
  Update github.com/google/go-github to v53 (go-gitea#25157)
  Fix bug for code search if code is disabled (go-gitea#25173)
  Minor arc-green color tweaks (go-gitea#25175)
  Fix duplicate Reviewed-by trailers (go-gitea#24796)
  Fix go-gitea#25133 (go-gitea#25162)
  Fix mobile navbar and misc cleanups (go-gitea#25134)
  Button and color enhancements (go-gitea#24989)
  Fix setup-go actions (go-gitea#25167)

# Conflicts:
#	templates/base/head_navbar.tmpl
@yp05327
Copy link
Contributor Author

yp05327 commented Jun 14, 2023

@yardenshoham
Do we need to remove backport/manual label when the manual backport is done?

@lunny
Copy link
Member

lunny commented Jun 14, 2023

@yardenshoham Do we need to remove backport/manual label when the manual backport is done?

I don't think so.

@yardenshoham
Copy link
Member

No. The bot ignores all PRs with backport/done All backports for this PR have been created or backport/manual No power to the bots! Create your backport yourself!

@yp05327 yp05327 deleted the fix-dismiss-review-modal-2 branch June 15, 2023 00:41
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 7, 2023
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

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@delvh delvh delvh 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.20 This PR should be backported to Gitea 1.20 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.
8 participants
@yp05327 @silverwind @GiteaBot @lunny @yardenshoham @wxiaoguang @delvh @techknowlogick