peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

table pull_request wasn't updated correctly (#2649)

Browse Source 
* Fix: table `pull_request` won't be updated correctly

* Update also status column when manually merged
This commit is contained in:
Kazuki Sawada 2017-10-06 06:25:40 +09:00 committed by Lauris BH
parent 6b62f042c6
commit ffab139c91
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/pull.go
View File

@ -422,7 +422,7 @@ func (pr *PullRequest) setMerged() (err error) {
if err = pr.Issue.changeStatus(sess, pr.Merger, pr.Issue.Repo, true); err != nil { if err = pr.Issue.changeStatus(sess, pr.Merger, pr.Issue.Repo, true); err != nil {
return fmt.Errorf("Issue.changeStatus: %v", err) return fmt.Errorf("Issue.changeStatus: %v", err)
} }
if _, err = sess.ID(pr.ID).Cols("has_merged").Update(pr); err != nil { if _, err = sess.ID(pr.ID).Cols("has_merged, status, merged_commit_id, merger_id, merged_unix").Update(pr); err != nil {
return fmt.Errorf("update pull request: %v", err) return fmt.Errorf("update pull request: %v", err)
} }