From d7ac9727bb5046118915cbb26b2dac1b7b27c9d4 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 22 Nov 2019 01:08:42 +0800 Subject: Move merge actions to notification (#9024) * Move merge actions to notification * Add missing mail notification --- modules/notification/action/action.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'modules/notification/action') diff --git a/modules/notification/action/action.go b/modules/notification/action/action.go index dd4dc0ae32..70ab9975b2 100644 --- a/modules/notification/action/action.go +++ b/modules/notification/action/action.go @@ -10,6 +10,7 @@ import ( "strings" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification/base" ) @@ -191,3 +192,17 @@ func (a *actionNotifier) NotifyPullRequestReview(pr *models.PullRequest, review log.Error("notify watchers '%d/%d': %v", review.Reviewer.ID, review.Issue.RepoID, err) } } + +func (*actionNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User, baseRepo *git.Repository) { + if err := models.NotifyWatchers(&models.Action{ + ActUserID: doer.ID, + ActUser: doer, + OpType: models.ActionMergePullRequest, + Content: fmt.Sprintf("%d|%s", pr.Issue.Index, pr.Issue.Title), + RepoID: pr.Issue.Repo.ID, + Repo: pr.Issue.Repo, + IsPrivate: pr.Issue.Repo.IsPrivate, + }); err != nil { + log.Error("NotifyWatchers [%d]: %v", pr.ID, err) + } +} -- cgit v1.2.3