Skip to content

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Jul 21, 2023

There's a typo in #22743
The correct table name is deleted_branch not deleted_branches

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 21, 2023
@yp05327 yp05327 changed the title Drop deleted branch table Drop the correct deleted branch table Jul 21, 2023
@lunny
Copy link
Member

lunny commented Jul 21, 2023

There's a typo in #22743 The correct table name is deleted_branch not deleted_branches

Could you also fix that typo?

@lunny lunny added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jul 21, 2023
@lunny lunny added this to the 1.21.0 milestone Jul 21, 2023
@yp05327
Copy link
Contributor Author

yp05327 commented Jul 21, 2023

There's a typo in #22743 The correct table name is deleted_branch not deleted_branches

Could you also fix that typo?

Done.

@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 Jul 21, 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 Jul 21, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 21, 2023
@GiteaBot
Copy link
Collaborator

@yp05327 please fix the merge conflicts. 🍵

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

Needs make fmt

@lunny lunny force-pushed the fix-drop-deleted-branch-table branch from df35f12 to 21fcb47 Compare July 22, 2023 08:43
@silverwind
Copy link
Member

Conflict in migration number.

@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 26, 2023
@lunny lunny merged commit 74ca437 into go-gitea:main Jul 26, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 26, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 26, 2023
* giteaofficial/main: (21 commits)
  Only show newly pushed branches message in the same repository (go-gitea#26148)
  Docusaurus-ify (go-gitea#26051)
  Display deprecated warning in admin panel pages as well as in the log file (go-gitea#26094)
  Remove "misc" scope check from public API endpoints (go-gitea#26134)
  Fix LFS object list style (go-gitea#26133)
  Drop the correct deleted branch table (go-gitea#26028)
  Fix CLI allowing creation of access tokens with existing name (go-gitea#26071)
  Fix incorrect router logger (go-gitea#26137)
  Increase table cell horizontal padding (go-gitea#26140)
  Update xorm version (go-gitea#26128)
  Fix UI for release tag page / wiki page / subscription page (go-gitea#25948)
  added ssh mirror workaround description (go-gitea#26096)
  Improve "gitea doctor" sub-command and fix "help" commands (go-gitea#26072)
  Fix wrong commit status in web ui (go-gitea#26121)
  remove IsWarning in  tmpl (go-gitea#26120)
  Fix minor capitalization error in string (go-gitea#26100)
  Improve commit graph alignment and truncating (go-gitea#26112)
  Fix wrong workflow status when rerun a job in an already finished workflow (go-gitea#26119)
  Allow Organisations to have a E-Mail (go-gitea#25082)
  doc sync authentication.md to zh-cn (go-gitea#26117)
  ...
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 24, 2023
@yp05327 yp05327 deleted the fix-drop-deleted-branch-table branch February 1, 2024 00:07
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
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
Development

Successfully merging this pull request may close these issues.

6 participants