Add delete branch track on pull request comments (#888)

* add delete branch track on pull request comments

* don't change vendor
This commit is contained in:
Lunny Xiao 2017-02-11 12:00:29 +08:00 committed by GitHub
parent 3576e1ee73
commit cf0f451c37
7 changed files with 55 additions and 2 deletions

View file

@ -6,6 +6,7 @@ package repo
import (
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log"
@ -70,12 +71,21 @@ func DeleteBranchPost(ctx *context.Context) {
}
if err := ctx.Repo.GitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{
Force: false,
Force: true,
}); err != nil {
log.Error(4, "DeleteBranch: %v", err)
ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
return
}
issueID := ctx.QueryInt64("issue_id")
if issueID > 0 {
if err := models.AddDeletePRBranchComment(ctx.User, ctx.Repo.Repository, issueID, branchName); err != nil {
log.Error(4, "DeleteBranch: %v", err)
ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
return
}
}
ctx.Flash.Success(ctx.Tr("repo.branch.deletion_success", fullBranchName))
}