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.
MergeRetargetChildrenOnMerge andAddDeletePRBranchComment intoservice.DeleteBranch.

Automerge supports deleting branch automatically after merging

e22862e

lunny added the type/enhancementAn improvement of existing functionality label

Oct 26, 2024

lunny added this to the1.23.0 milestone

Oct 26, 2024

GiteaBot added the lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. label

Oct 26, 2024

pull-request-sizebot added the size/M label

Oct 26, 2024

github-actionsbot 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

Fix lint

499eb51

yp05327 reviewed

Nov 5, 2024

View reviewed changes

models/migrations/v1_23/v307.go OutdatedShow resolvedHide resolved

lunny added3 commits

November 4, 2024 20:42

Fix bug

47c9581

Merge branch 'main' into lunny/automerge_support_delete_branch

ef98449

Merge branch 'main' into lunny/automerge_support_delete_branch

b68ed81

wxiaoguang reviewed

Nov 7, 2024

View reviewed changes

services/automerge/automerge.go OutdatedShow resolvedHide resolved

lunny added2 commits

November 8, 2024 10:36

Merge branch 'main' into lunny/automerge_support_delete_branch

c879891

Add permission check when deleting branch after automerge succeed

6d79d8a

wxiaoguang reviewed

Nov 8, 2024

View reviewed changes

services/automerge/automerge.go OutdatedShow resolvedHide resolved

lunny added3 commits

November 8, 2024 18:30

refactor delete head branch of pull request

7562393

Move all checks into DeleteBranch and PushUpdate

e70e375

Merge branch 'main' into lunny/automerge_support_delete_branch

04fa8f2

pull-request-sizebot added size/L and removed size/M labels

Nov 10, 2024

lunny commented

Nov 10, 2024

View reviewed changes

routers/api/v1/repo/branch.go OutdatedShow resolvedHide resolved

lunny commented

Nov 10, 2024

View reviewed changes

routers/api/v1/repo/branch.go OutdatedShow resolvedHide resolved

lunny marked this pull request as draft

November 10, 2024 02:18

lunny added3 commits

November 9, 2024 20:38

Fix lint

70b06b8

Add deleting branch comment

ac0a4ea

Fix lint

a154697

lunny mentioned this pull request

Nov 10, 2024

Enale delete branch when requesting merge PR after successful build#32466

Closed

lunny requested review fromZettat123,wxiaoguang andyp05327

December 6, 2024 08:01

lunny added2 commits

December 16, 2024 16:20

Merge branch 'main' into lunny/automerge_support_delete_branch

80110be

Merge branch 'main' into lunny/automerge_support_delete_branch

aee8ef3

Zettat123 approved these changes

Dec 25, 2024

View reviewed changes

GiteaBot added lgtm/need 1This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labels

Dec 25, 2024

lunny mentioned this pull request

Dec 27, 2024

WIP: Add directory support for wiki#33000

Closed

lunny added6 commits

December 30, 2024 12:04

Merge branch 'main' into lunny/automerge_support_delete_branch

8ed0375

Fix merge bug

be5a5ea

Remove unnecessary errlist

fa12a24

Merge branch 'main' into lunny/automerge_support_delete_branch

a00773c

Move migration to v1.24

f549185

Merge branch 'main' into lunny/automerge_support_delete_branch

774152b

Copy link

MemberAuthor

lunny commentedJan 8, 2025

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

wolfogre approved these changes

Jan 9, 2025

View reviewed changes

GiteaBot added lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1This PR needs approval from one additional maintainer to be merged. labels

Jan 9, 2025

lunny added the reviewed/wait-mergeThis pull request is part of the merge queue. It will be merged soon. label

Jan 9, 2025

GiteaBotand others added3 commits

January 10, 2025 02:33

Merge branch 'main' into lunny/automerge_support_delete_branch

101063a

Fix merge bug

50c2316

Merge branch 'main' into lunny/automerge_support_delete_branch

1317040

lunny merged commit39d51e7 intogo-gitea:main

Jan 9, 2025

26 checks passed

lunny deleted the lunny/automerge_support_delete_branch branch

January 9, 2025 19:51

GiteaBot removed the reviewed/wait-mergeThis 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

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)