summaryrefslogtreecommitdiffstats
path: root/routers/repo/pull.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-03-13 23:20:22 -0400
committerUnknwon <u@gogs.io>2016-03-13 23:20:22 -0400
commit9bd9ad420582a7a34d18011847bb789f64271b1f (patch)
tree05b1191897ed5f56395faacd3c8bf1ab00a14c9c /routers/repo/pull.go
parentdd6faf7f9bd0a1dbf986e124ea0f4db249e1da48 (diff)
downloadgitea-9bd9ad420582a7a34d18011847bb789f64271b1f.tar.gz
gitea-9bd9ad420582a7a34d18011847bb789f64271b1f.zip
#1692 add CRUD issue APIs
- Fix go-gogs-client#10 - Related to #809
Diffstat (limited to 'routers/repo/pull.go')
-rw-r--r--routers/repo/pull.go11
1 files changed, 3 insertions, 8 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index c2147bbaf5..8ad4f3f8e4 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -156,10 +156,7 @@ func checkPullInfo(ctx *context.Context) *models.Issue {
return nil
}
- if err = issue.GetPoster(); err != nil {
- ctx.Handle(500, "GetPoster", err)
- return nil
- } else if err = issue.GetPullRequest(); err != nil {
+ if err = issue.GetPullRequest(); err != nil {
ctx.Handle(500, "GetPullRequest", err)
return nil
} else if err = issue.GetHeadRepo(); err != nil {
@@ -682,10 +679,8 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm)
} else if err := pullRequest.PushToBaseRepo(); err != nil {
ctx.Handle(500, "PushToBaseRepo", err)
return
- }
-
- notifyWatchersAndMentions(ctx, pullIssue)
- if ctx.Written() {
+ } else if err := MailWatchersAndMentions(ctx, pullIssue); err != nil {
+ ctx.Handle(500, "MailWatchersAndMentions", err)
return
}