Browse Source

tmp: fix issue open count

tags/v1.21.12.1
Unknwon 10 years ago
parent
commit
5da306c0e5
2 changed files with 5 additions and 5 deletions
  1. +3
    -4
      models/issue.go
  2. +2
    -1
      routers/repo/pull.go

+ 3
- 4
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 = 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) headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)


+ 2
- 1
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
} }


Loading…
Cancel
Save