Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Fix user router possbile panic #29751

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Fix user router possbile panic #29751

merged 2 commits into from
Mar 13, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented Mar 13, 2024 •
edited
Loading

regression from #28023

@lunny lunny added the type/bug label Mar 13, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 13, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 13, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Mar 13, 2024
@lunny lunny added this to the 1.22.0 milestone Mar 13, 2024
@lunny lunny added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Mar 13, 2024
@lunny lunny changed the title Fix user router Fix user router possbile panic Mar 13, 2024
@lunny lunny requested a review from 6543 March 13, 2024 03:58
@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 13, 2024
@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 13, 2024
@6543 6543 enabled auto-merge (squash) March 13, 2024 06:27
@6543 6543 added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 13, 2024
@6543 6543 merged commit 67e9f0d into go-gitea:main Mar 13, 2024
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 13, 2024
@lunny lunny deleted the lunny/fix_user_router branch March 13, 2024 07:05
@6543 6543 added the backport/v1.21 This PR should be backported to Gitea 1.21 label Mar 13, 2024
@GiteaBot
Copy link
Collaborator

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

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

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Mar 13, 2024
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 13, 2024
@silverwind
Merge branch 'main' into overflow-menu
b1e4857 
* main:
  fix missed RenderLabel change in card template (go-gitea#29772)
  Fix incorrect locale Tr for gpg command (go-gitea#29754)
  Improve a11y document and dropdown item (go-gitea#29753)
  Improve QueryEscape helper function (go-gitea#29768)
  Use relative links for commits, mentions, and issues in markdown (go-gitea#29427)
  Move fork router functions to a standalone file (go-gitea#29756)
  Configure pinned JS dependencies via updates.config.js (go-gitea#29696)
  Refactor to use optional.Option for issue index search option (go-gitea#29739)
  Fix user router possbile panic (go-gitea#29751)
  Refactor label.IsArchived() (go-gitea#29750)
  Fix date rendering by adding `<gitea-absolute-date>` (go-gitea#29725)
  Update to labeler v5 (go-gitea#29721)
  Update Chroma to v2.13.0 (go-gitea#29732)
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 14, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
6e7fc2d 
* giteaofficial/main:
  Fix `make generate-swagger` in go 1.22 (go-gitea#29780)
  Fix incorrect menu/link on webhook edit page (go-gitea#29709)
  Add test for webhook (go-gitea#29755)
  Fix possible NPE in ToPullReviewList (go-gitea#29759)
  fix missed RenderLabel change in card template (go-gitea#29772)
  Fix incorrect locale Tr for gpg command (go-gitea#29754)
  Improve a11y document and dropdown item (go-gitea#29753)
  Improve QueryEscape helper function (go-gitea#29768)
  Use relative links for commits, mentions, and issues in markdown (go-gitea#29427)
  Move fork router functions to a standalone file (go-gitea#29756)
  Configure pinned JS dependencies via updates.config.js (go-gitea#29696)
  Refactor to use optional.Option for issue index search option (go-gitea#29739)
  Fix user router possbile panic (go-gitea#29751)
  Refactor label.IsArchived() (go-gitea#29750)
lunny added a commit to lunny/gitea that referenced this pull request Mar 14, 2024
@lunny
Fix user router possbile panic (go-gitea#29751)
a736aeb 
regression from go-gitea#28023
@lunny lunny mentioned this pull request Mar 14, 2024
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Mar 14, 2024
wxiaoguang pushed a commit that referenced this pull request Mar 14, 2024
@lunny
Fix user router possbile panic (#29751) (#29786)
61db562 
regression from #28023
backport #29751
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 11, 2024
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@6543 6543 6543 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 size/S Denotes a PR that changes 10-29 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
4 participants
@lunny @GiteaBot @wxiaoguang @6543