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

Automerge supports deleting branch automatically after merging #32343

Merged
merged 33 commits into from
Jan 9, 2025
Merged

Automerge supports deleting branch automatically after merging #32343

merged 33 commits into from
Jan 9, 2025

Conversation

lunny
Copy link
Member

@lunny lunny commented Oct 26, 2024 •
edited
Loading

Resolve #32341
Depends on #27151

  • It will display a checkbox of deleting the head branch on the pull request view page when starting an auto-merge task.
  • Add permission check before deleting the branch
  • Add delete branch comment for those closing pull requests because of head branch or base branch was deleted.
  • Merge RetargetChildrenOnMerge and AddDeletePRBranchComment into service.DeleteBranch.

@lunny lunny added the type/enhancement An improvement of existing functionality label Oct 26, 2024
@lunny lunny added this to the 1.23.0 milestone Oct 26, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 26, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 26, 2024
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code modifies/migrations modifies/frontend labels Oct 26, 2024
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 10, 2024
lunny
lunny commented Nov 10, 2024
View reviewed changes
routers/api/v1/repo/branch.go Outdated Show resolved Hide resolved
lunny
lunny commented Nov 10, 2024
View reviewed changes
routers/api/v1/repo/branch.go Outdated Show resolved Hide resolved
@lunny lunny marked this pull request as draft November 10, 2024 02:18
@lunny lunny mentioned this pull request Nov 10, 2024
Closed
@lunny lunny marked this pull request as ready for review December 6, 2024 07:53
@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 Dec 25, 2024
@lunny lunny mentioned this pull request Dec 27, 2024
Closed
@lunny
Copy link
Member Author

lunny commented Jan 8, 2025

last call @go-gitea/technical-oversight-committee

@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 Jan 9, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 9, 2025
@lunny lunny merged commit 39d51e7 into go-gitea:main Jan 9, 2025
26 checks passed
@lunny lunny deleted the lunny/automerge_support_delete_branch branch January 9, 2025 19:51
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 9, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 10, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
9e7866c 
* giteaofficial/main:
  Fix raw file API ref handling (go-gitea#33172)
  [skip ci] Updated translations via Crowdin
  Fix ACME panic (go-gitea#33178)
  Automerge supports deleting branch automatically after merging (go-gitea#32343)
  Fix branch dropdown not display ref name (go-gitea#33159)
  Add .run to gitignore (go-gitea#33175)
  Fix assignee list overlapping in Issue sidebar (go-gitea#33176)
  Fix pam auth test regression (go-gitea#33169)
  Move repo size to sidebar (go-gitea#33155)
  Fix fuzz test (go-gitea#33156)
  Refactor older tests to use testify (go-gitea#33140)
  [skip ci] Updated translations via Crowdin
  Fix typo in gitea downloader test and add missing codebase in `ToGitServiceType` (go-gitea#33146)
  Fix form width (go-gitea#33151)
  Convert github.com/xanzy/go-gitlab into gitlab.com/gitlab-org/api/client-go (go-gitea#33126)
  Refactor HTMLFormat, update chroma render, fix js error (go-gitea#33136)
  Add missed transaction on setmerged (go-gitea#33079)
@viceice viceice mentioned this pull request Jan 27, 2025
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zettat123 Zettat123 Zettat123 approved these changes

@wolfogre wolfogre wolfogre approved these changes

@wxiaoguang wxiaoguang Awaiting requested review from wxiaoguang

@yp05327 yp05327 Awaiting requested review from yp05327

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/frontend modifies/go Pull requests that update Go code modifies/migrations size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.24.0
Development

Successfully merging this pull request may close these issues.

Automerge doesn't respect branch deletion rule
6 participants
@lunny @wxiaoguang @wolfogre @Zettat123 @yp05327 @GiteaBot