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 rename branch 500 when the target branch is deleted but exist in database (#30430) #30437

Merged
merged 2 commits into from
Apr 12, 2024
Merged

Fix rename branch 500 when the target branch is deleted but exist in database (#30430) #30437

merged 2 commits into from
Apr 12, 2024

Conversation

GiteaBot
Copy link
Contributor

Backport #30430 by @lunny

Fix #30428

@GiteaBot GiteaBot added modifies/go Pull requests that update Go code type/bug labels Apr 12, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 12, 2024
@GiteaBot GiteaBot added this to the 1.21.11 milestone Apr 12, 2024
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 12, 2024
@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 Apr 12, 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 Apr 12, 2024
@silverwind
Copy link
Member

@lunny needs manual fixes:

Error: tests/integration/rename_branch_test.go:85:49: undefined: gitea_context.CookieNameFlash
Error: tests/integration/rename_branch_test.go:113:48: undefined: gitea_context.CookieNameFlash (typecheck)

@lunny lunny merged commit 68bd1dd into go-gitea:release/v1.21 Apr 12, 2024
27 checks passed
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@lafriks lafriks lafriks approved these changes

@wolfogre wolfogre Awaiting requested review from wolfogre

Assignees

@lunny lunny

Labels
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/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.21.11
Development

Successfully merging this pull request may close these issues.
4 participants
@GiteaBot @silverwind @lunny @lafriks