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

Fix bug for ctx usage #26762

Merged
merged 1 commit into from
Aug 28, 2023
Merged

Fix bug for ctx usage #26762

merged 1 commit into from
Aug 28, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Aug 28, 2023 •
edited
Loading

Regression from #26158

Fix #26684

@lunny lunny 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 Aug 28, 2023
@lunny lunny added this to the 1.21.0 milestone Aug 28, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 28, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 28, 2023
@lunny lunny added the backport/manual No power to the bots! Create your backport yourself! label Aug 28, 2023
@lunny lunny mentioned this pull request Aug 28, 2023
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Aug 28, 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 Aug 28, 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 Aug 28, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 28, 2023
@lunny lunny enabled auto-merge (squash) August 28, 2023 03:52
@lunny lunny merged commit 6945918 into go-gitea:main Aug 28, 2023
24 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 28, 2023
wxiaoguang pushed a commit that referenced this pull request Aug 28, 2023
@lunny
Fix bug for ctx usage (#26763)
a1cec41 
Fix #26684 
Backport #26762
@lunny lunny deleted the lunny/fix_hang_bug branch August 28, 2023 04:28
zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 28, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
bc79ffa 
* giteaofficial/main:
  Fix bug for ctx usage (go-gitea#26762)
  Remove some transition related code (go-gitea#26755)
  Expanded minimum RSA Keylength to 3072 (go-gitea#26604)
  [skip ci] Updated licenses and gitignores
  Use docs.gitea.com instead of docs.gitea.io (go-gitea#26739)
  Adding hint `Archived` to archive label. (go-gitea#26741)

# Conflicts:
#	templates/base/head_navbar.tmpl
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Nov 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@CaiCandong CaiCandong CaiCandong 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. 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.21.0
Development

Successfully merging this pull request may close these issues.

Hang with 1.20.2/1.20.3
4 participants
@lunny @wxiaoguang @CaiCandong @GiteaBot