Fix wrong notification on merge (#9450)

guillep2k · zeripath · commit 4f42e03a3504 · 2019-12-20T22:31:05.000Z
diff --git a/modules/notification/mail/mail.go b/modules/notification/mail/mail.go
@@ -106,7 +106,7 @@ func (m *mailNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *mode
 		return
 	}
 
-	if err := mailer.MailParticipants(pr.Issue, doer, models.ActionClosePullRequest); err != nil {
+	if err := mailer.MailParticipants(pr.Issue, doer, models.ActionMergePullRequest); err != nil {
 		log.Error("MailParticipants: %v", err)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func (m mailNotifier) NotifyMergePullRequest(pr models.PullRequest, doer *mode`
`106`	`106`	`return`
`107`	`107`	`}`
`108`	`108`
`109`		`- if err := mailer.MailParticipants(pr.Issue, doer, models.ActionClosePullRequest); err != nil {`
	`109`	`+ if err := mailer.MailParticipants(pr.Issue, doer, models.ActionMergePullRequest); err != nil {`
`110`	`110`	`log.Error("MailParticipants: %v", err)`
`111`	`111`	`}`
`112`	`112`	`}`