lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes wrong after field in webhook payload (#1746)

release/v1.15
Kim "BKC" Carlbäcker 2017-05-19 12:12:27 +02:00 committed by GitHub
parent 281a0389c1 407fbfa6ce
commit 977dcf96e0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/pull.go
View File

@ -328,7 +328,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
return fmt.Errorf("git push: %s", stderr) return fmt.Errorf("git push: %s", stderr)
} }
pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.HeadBranch) pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.BaseBranch)
if err != nil { if err != nil {
return fmt.Errorf("GetBranchCommit: %v", err) return fmt.Errorf("GetBranchCommit: %v", err)
} }