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

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

merged 2 commits into from
Apr 12, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented Apr 12, 2024

Fix #30428

@lunny lunny added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 backport/v1.22 This PR should be backported to Gitea 1.22 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
@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
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Apr 12, 2024
@yp05327 yp05327 added this to the 1.23.0 milestone 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
@lafriks lafriks merged commit 9466fec into go-gitea:main Apr 12, 2024
26 checks passed
@GiteaBot GiteaBot mentioned this pull request Apr 12, 2024
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 12, 2024
@lunny @GiteaBot
Fix rename branch 500 when the target branch is deleted but exist in …
b840aac 
…database (go-gitea#30430)

Fix go-gitea#30428
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 12, 2024
@lunny @GiteaBot
Fix rename branch 500 when the target branch is deleted but exist in …
00868cd 
…database (go-gitea#30430)

Fix go-gitea#30428
@GiteaBot GiteaBot mentioned this pull request Apr 12, 2024
Merged
lunny added a commit that referenced this pull request Apr 12, 2024
@GiteaBot @lunny
Fix rename branch 500 when the target branch is deleted but exist in …
cabe4e0 
…database (#30430) (#30438)

Backport #30430 by @lunny

Fix #30428

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@lunny lunny deleted the lunny/fix_rename_branch branch April 12, 2024 10:56
@lunny lunny added the backport/done All backports for this PR have been created label Apr 12, 2024
lunny added a commit that referenced this pull request Apr 12, 2024
@GiteaBot @lunny
Fix rename branch 500 when the target branch is deleted but exist in …
68bd1dd 
…database (#30430) (#30437)

Backport #30430 by @lunny

Fix #30428

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
silverwind added a commit to silverwind/gitea that referenced this pull request Apr 13, 2024
@silverwind
Merge remote-tracking branch 'origin/main' into support_render_openapi
ff8a5b3 
* origin/main: (1540 commits)
  Add `interface{}` to `any` replacement to `make fmt`, exclude `*.pb.go` (go-gitea#30461)
  Fix network error when open/close organization/individual projects and redirect to project page (go-gitea#30387)
  Avoid losing token when updating mirror settings (go-gitea#30429)
  Fix label rendering (go-gitea#30456)
  Add comment for ContainsRedirectURI about the exact match (go-gitea#30457)
  Update JS and PY deps, lock eslint and related plugins (go-gitea#30452)
  Refactor cache and disable go-chi cache (go-gitea#30417)
  Fix admin notice view-detail (go-gitea#30450)
  Fix mirror error when mirror repo is empty (go-gitea#30432)
  Add `/public/assets/img/webpack` to ignore files again (go-gitea#30451)
  Lock a few tool dependencies to major versions (go-gitea#30439)
  Fix commit status cache which missed target_url (go-gitea#30426)
  Remove jQuery from the commit graph (except Fomantic) (go-gitea#30395)
  Fix rename branch 500 when the target branch is deleted but exist in database (go-gitea#30430)
  Limit the max line length when parsing git grep output (go-gitea#30418)
  Change the default maxPerPage for gitbucket (go-gitea#30392)
  Fix the spacing issue in the Project view (go-gitea#30415)
  Add commit status summary table to reduce query from commit status table (go-gitea#30223)
  Split `issue edit` code from `repo-legacy.js` into its own file (go-gitea#30419)
  Check the token's owner and repository when registering a runner (go-gitea#30406)
  ...
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 14, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
d51ac9b 
* giteaofficial/main:
  Fix JS error when opening to expanded code comment (go-gitea#30463)
  fix: Fix to delete cookie when AppSubURL is non-empty (go-gitea#30375)
  Add `interface{}` to `any` replacement to `make fmt`, exclude `*.pb.go` (go-gitea#30461)
  Fix network error when open/close organization/individual projects and redirect to project page (go-gitea#30387)
  Avoid losing token when updating mirror settings (go-gitea#30429)
  Fix label rendering (go-gitea#30456)
  Add comment for ContainsRedirectURI about the exact match (go-gitea#30457)
  Update JS and PY deps, lock eslint and related plugins (go-gitea#30452)
  Refactor cache and disable go-chi cache (go-gitea#30417)
  Fix admin notice view-detail (go-gitea#30450)
  Fix mirror error when mirror repo is empty (go-gitea#30432)
  Add `/public/assets/img/webpack` to ignore files again (go-gitea#30451)
  Lock a few tool dependencies to major versions (go-gitea#30439)
  Fix commit status cache which missed target_url (go-gitea#30426)
  Remove jQuery from the commit graph (except Fomantic) (go-gitea#30395)
  Fix rename branch 500 when the target branch is deleted but exist in database (go-gitea#30430)
  Limit the max line length when parsing git grep output (go-gitea#30418)
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 27, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 11, 2024
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Reviewers

@lafriks lafriks lafriks approved these changes

@wolfogre wolfogre wolfogre approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 backport/v1.22 This PR should be backported to Gitea 1.22 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. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

Unique Constraint error when renaming a branch
6 participants
@lunny @lafriks @wolfogre @wxiaoguang @yp05327 @GiteaBot