Fix bug when delete branch don't close related PRs

Author: lunny

options/locale/locale_en-US.ini

@@ -1967,6 +1967,7 @@ branch.delete_html = Delete Branch
 branch.delete_desc = Deleting a branch is permanent. It <strong>CANNOT</strong> be undone. Continue?
 branch.deletion_success = Branch '%s' has been deleted.
 branch.deletion_failed = Failed to delete branch '%s'.
+branch.delete_branch_close_prs_failed = Failed to close related pull requests when delete branch '%s'.
 branch.delete_branch_has_new_commits = Branch '%s' cannot be deleted because new commits have been added after merging.
 branch.create_branch = Create branch <strong>%s</strong>
 branch.create_from = from '%s'

routers/api/v1/repo/branch.go

@@ -155,6 +155,11 @@ func DeleteBranch(ctx *context.APIContext) {
 		return
 	}
 
+	if err := pull_service.CloseBranchPulls(ctx.User, ctx.Repo.Repository.ID, branchName); err != nil {
+		log.Error("CloseBranchPulls: %v", err)
+		return
+	}
+
 	// Don't return error below this
 	if err := repo_service.PushUpdate(
 		&repo_module.PushUpdateOptions{

routers/repo/branch.go

@@ -21,6 +21,7 @@ import (
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/routers/utils"
 	"code.gitea.io/gitea/services/forms"
+	pull_service "code.gitea.io/gitea/services/pull"
 	release_service "code.gitea.io/gitea/services/release"
 	repo_service "code.gitea.io/gitea/services/repository"
 )
@@ -183,6 +184,11 @@ func deleteBranch(ctx *context.Context, branchName string) error {
 		return err
 	}
 
+	if err := pull_service.CloseBranchPulls(ctx.User, ctx.Repo.Repository.ID, branchName); err != nil {
+		log.Error("CloseBranchPulls: %v", err)
+		return err
+	}
+
 	// Don't return error below this
 	if err := repo_service.PushUpdate(
 		&repo_module.PushUpdateOptions{

routers/repo/pull.go

@@ -1226,6 +1226,12 @@ func CleanUpPullRequest(ctx *context.Context) {
 		return
 	}
 
+	if err := pull_service.CloseBranchPulls(ctx.User, pr.HeadRepo.ID, pr.HeadBranch); err != nil {
+		log.Error("CloseBranchPulls: %v", err)
+		ctx.Flash.Error(ctx.Tr("repo.branch.delete_branch_close_prs_failed", fullBranchName))
+		return
+	}
+
 	if err := repo_service.PushUpdate(
 		&repo_module.PushUpdateOptions{
 			RefFullName:  git.BranchPrefix + pr.HeadBranch,