From 27d30f1a619ff716e39d79e7322c487e1299b75d Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Sat, 28 Jan 2017 13:59:58 -0200 Subject: [PATCH] Notifying on open PR, and Close/Reopen/Merge issue or PR --- routers/repo/issue.go | 2 ++ routers/repo/pull.go | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 6ef34746e..7ae614038 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -875,6 +875,8 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { log.Error(4, "ChangeStatus: %v", err) } else { log.Trace("Issue [%d] status changed to closed: %v", issue.ID, issue.IsClosed) + + notification.Service.NotifyIssue(issue, ctx.User.ID) } } } diff --git a/routers/repo/pull.go b/routers/repo/pull.go index f0162cca0..f518c9edc 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -16,7 +16,9 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/setting" + "github.com/Unknwon/com" ) @@ -415,6 +417,8 @@ func MergePullRequest(ctx *context.Context) { return } + notification.Service.NotifyIssue(pr.Issue, ctx.User.ID) + log.Trace("Pull request merged: %d", pr.ID) ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index)) } @@ -707,6 +711,8 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) return } + notification.Service.NotifyIssue(pullIssue, ctx.User.ID) + log.Trace("Pull request created: %d/%d", repo.ID, pullIssue.ID) ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pullIssue.Index)) }