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

Trigger webhook when deleting a branch after merging a PR #9424

Merged
merged 4 commits into from
Dec 25, 2019
Merged

Trigger webhook when deleting a branch after merging a PR #9424

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae3e77e
fixed so when deleting a branch after merging a PR, a webhook is trig…
bhalbright Dec 19, 2019
b24b56b
changed to use pr.HeadRepo instead of ctx.Repo when sending webhook f…
bhalbright Dec 20, 2019
afdc845
Merge branch 'master' into delete-branch
lafriks Dec 24, 2019
674a0d5
Merge branch 'master' into delete-branch
lunny Dec 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fixed so when deleting a branch after merging a PR, a webhook is trig… 
…gered
  • Loading branch information
@bhalbright
bhalbright committed Dec 19, 2019
commit ae3e77e1083ddc4e8a5f9402dfddc7a999f0d824
16 changes: 16 additions & 0 deletions routers/repo/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/repofiles"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/services/gitdiff"
Expand Down Expand Up @@ -928,6 +929,21 @@ func CleanUpPullRequest(ctx *context.Context) {
return
}

if err := repofiles.PushUpdate(
ctx.Repo.Repository,
lafriks marked this conversation as resolved.
Show resolved Hide resolved
pr.HeadBranch,
repofiles.PushUpdateOptions{
RefFullName: git.BranchPrefix + pr.HeadBranch,
OldCommitID: branchCommitID,
NewCommitID: git.EmptySHA,
PusherID: ctx.User.ID,
PusherName: ctx.User.Name,
RepoUserName: ctx.Repo.Owner.Name,
RepoName: ctx.Repo.Repository.Name,
}); err != nil {
log.Error("Update: %v", err)
}

if err := models.AddDeletePRBranchComment(ctx.User, pr.BaseRepo, issue.ID, pr.HeadBranch); err != nil {
// Do not fail here as branch has already been deleted
log.Error("DeleteBranch: %v", err)
Expand Down