peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Trigger MergePullRequestAction when PR is manually merged

Browse Source
This commit is contained in:
Keith Rutkowski 2018-05-25 09:01:03 -04:00
parent 7e6475ac1e
commit 6c1a73a06d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
models/action.go
View File

@ -795,10 +795,12 @@ func TransferRepoAction(doer, oldOwner *User, repo *Repository) error {
return transferRepoAction(x, doer, oldOwner, repo) return transferRepoAction(x, doer, oldOwner, repo)
} }
// MergePullRequestAction adds new action for merging pull request. // MergePullRequestAction adds new action for merging pull request (including manually merged pull requests).
func MergePullRequestAction(doer *User, repo *Repository, pull *Issue, commits *PushCommits) error { func MergePullRequestAction(doer *User, repo *Repository, pull *Issue, commits *PushCommits) error {
if err := UpdateIssuesCommit(doer, repo, commits.Commits, true); err != nil { if commits != nil {
log.Error(4, "UpdateIssuesCommit: %v", err) if err := UpdateIssuesCommit(doer, repo, commits.Commits, true); err != nil {
log.Error(4, "UpdateIssuesCommit: %v", err)
}
} }
if err := UpdateIssuesComment(doer, repo, pull, nil, true); err != nil { if err := UpdateIssuesComment(doer, repo, pull, nil, true); err != nil {

5
models/pull.go
View File

@ -581,6 +581,11 @@ func (pr *PullRequest) manuallyMerged() bool {
return false return false
} }
log.Info("manuallyMerged[%d]: Marked as manually merged into %s/%s by commit id: %s", pr.ID, pr.BaseRepo.Name, pr.BaseBranch, commit.ID.String()) log.Info("manuallyMerged[%d]: Marked as manually merged into %s/%s by commit id: %s", pr.ID, pr.BaseRepo.Name, pr.BaseBranch, commit.ID.String())
if err = MergePullRequestAction(pr.Merger, pr.Issue.Repo, pr.Issue, nil); err != nil {
log.Error(4, "MergePullRequestAction [%d]: %v", pr.ID, err)
}
return true return true
} }
return false return false