From 5da306c0e5a2939b836d5ec00a0984a2c30e0f9f Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 2 Sep 2015 11:13:37 -0400 Subject: tmp: fix issue open count --- models/issue.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'models') diff --git a/models/issue.go b/models/issue.go index 9810a259..fff33cf3 100644 --- a/models/issue.go +++ b/models/issue.go @@ -903,16 +903,15 @@ func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) { } // Merge merges pull request to base repository. -func (pr *PullRequest) Merge(baseGitRepo *git.Repository) (err error) { +func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error) { sess := x.NewSession() defer sessionRelease(sess) if err = sess.Begin(); err != nil { return err } - pr.Pull.IsClosed = true - if _, err = sess.Id(pr.Pull.ID).AllCols().Update(pr.Pull); err != nil { - return fmt.Errorf("update pull: %v", err) + if err = pr.Pull.changeStatus(sess, doer, true); err != nil { + return fmt.Errorf("Pull.changeStatus: %v", err) } headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name) -- cgit v1.2.3