diff options
| author | Kazuki Sawada <kazuki@6715.jp> | 2017-10-06 06:25:40 +0900 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2017-10-06 00:25:40 +0300 |
| commit | ffab139c9193a70ed76d83a4655e82c74af52b25 (patch) | |
| tree | c26211ba531fb075486f02a62f7eba745ffed95f | |
| parent | 6b62f042c6ac17fe70fb1b404b84fe14e309ea59 (diff) | |
| download | gitea-ffab139c9193a70ed76d83a4655e82c74af52b25.tar.gz gitea-ffab139c9193a70ed76d83a4655e82c74af52b25.zip | |
table `pull_request` wasn't updated correctly (#2649)
* Fix: table `pull_request` won't be updated correctly
* Update also status column when manually merged
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index ae6d13ed79..4b928c8d9b 100644 --- a/models/pull.go +++ b/models/pull.go @@ -422,7 +422,7 @@ func (pr *PullRequest) setMerged() (err error) { if err = pr.Issue.changeStatus(sess, pr.Merger, pr.Issue.Repo, true); err != nil { 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) } |