tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-12-07 13:28:25 +00:00
Code Releases Activity

Automerge supports deleting branch automatically after merging

Browse Source
This commit is contained in:
Lunny Xiao
2024-10-25 19:47:59 -07:00
parent 7cf611d197
commit e22862e0bb
7 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routers/api/v1/repo/pull.go
+1 -1
View File
@@ -1000,7 +1000,7 @@ func MergePullRequest(ctx *context.APIContext) {
}
if form.MergeWhenChecksSucceed {
scheduled, err := automerge.ScheduleAutoMerge(ctx, ctx.Doer, pr, repo_model.MergeStyle(form.Do), message)
scheduled, err := automerge.ScheduleAutoMerge(ctx, ctx.Doer, pr, repo_model.MergeStyle(form.Do), message, form.DeleteBranchAfterMerge)
if err != nil {
if pull_model.IsErrAlreadyScheduledToAutoMerge(err) {
ctx.Error(http.StatusConflict, "ScheduleAutoMerge", err)