coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tmp: fix issue open count

This commit is contained in:
Unknwon 2015-09-02 11:13:37 -04:00
parent d951824ff9
commit 5da306c0e5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
models/issue.go
View File

@ -903,16 +903,15 @@ func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) {
} }
// Merge merges pull request to base repository. // 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() sess := x.NewSession()
defer sessionRelease(sess) defer sessionRelease(sess)
if err = sess.Begin(); err != nil { if err = sess.Begin(); err != nil {
return err return err
} }
pr.Pull.IsClosed = true if err = pr.Pull.changeStatus(sess, doer, true); err != nil {
if _, err = sess.Id(pr.Pull.ID).AllCols().Update(pr.Pull); err != nil { return fmt.Errorf("Pull.changeStatus: %v", err)
return fmt.Errorf("update pull: %v", err)
} }
headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name) headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)

3
routers/repo/pull.go
View File

@ -381,7 +381,8 @@ func MergePullRequest(ctx *middleware.Context) {
} }
pr.Pull = pull pr.Pull = pull
if err = pr.Merge(ctx.Repo.GitRepo); err != nil { pr.Pull.Repo = ctx.Repo.Repository
if err = pr.Merge(ctx.User, ctx.Repo.GitRepo); err != nil {
ctx.Handle(500, "GetPullRequestByPullID", err) ctx.Handle(500, "GetPullRequestByPullID", err)
return return
} }