#1612 Ability to send mail when a new pull request is submitted

2 files changed, 9 insertions, 4 deletions

diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index ed9454440a..45e63dd9c3 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -343,8 +343,8 @@ func ValidateRepoMetas(ctx *middleware.Context, form auth.CreateIssueForm) ([]in
 	return labelIDs, milestoneID, assigneeID
 }
 
-func checkMentions(ctx *middleware.Context, issue *models.Issue) {
-	// Update mentions.
+func notifyWatchersAndMentions(ctx *middleware.Context, issue *models.Issue) {
+	// Update mentions
 	mentions := base.MentionPattern.FindAllString(issue.Content, -1)
 	if len(mentions) > 0 {
 		for i := range mentions {
@@ -423,7 +423,7 @@ func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) {
 		return
 	}
 
-	checkMentions(ctx, issue)
+	notifyWatchersAndMentions(ctx, issue)
 	if ctx.Written() {
 		return
 	}
@@ -871,7 +871,7 @@ func NewComment(ctx *middleware.Context, form auth.CreateCommentForm) {
 		return
 	}
 
-	checkMentions(ctx, &models.Issue{
+	notifyWatchersAndMentions(ctx, &models.Issue{
 		ID:      issue.ID,
 		Index:   issue.Index,
 		Name:    issue.Name,
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index d8163a4078..d0c1cb6703 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -634,6 +634,11 @@ func CompareAndPullRequestPost(ctx *middleware.Context, form auth.CreateIssueFor
 		return
 	}
 
+	notifyWatchersAndMentions(ctx, pull)
+	if ctx.Written() {
+		return
+	}
+
 	log.Trace("Pull request created: %d/%d", repo.ID, pull.ID)
 	ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pull.Index))
 }