mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-08-30 19:41:03 +02:00
table pull_request
wasn't updated correctly (#2649)
* Fix: table `pull_request` won't be updated correctly * Update also status column when manually merged
This commit is contained in:
parent
6b62f042c6
commit
ffab139c91
|
@ -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)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue