domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Refactor comment (#9330)

Browse source 
* Refactor comment

* fix test

* improve code
This commit is contained in:
Lunny Xiao 2019-12-16 05:57:34 +08:00 • committed by techknowlogick
parent c6b3c5bcef
commit 67b316a954
16 changed files with 144 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/pull.go
View file

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