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

Don't attempt to close issue if already closed (#9696)

Browse source 
Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
guillep2k 2020-01-10 22:20:11 -03:00 • committed by Lunny Xiao
parent 438e159d04
commit 705b1e49a8
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
services/pull/merge.go
View file

@ -374,8 +374,10 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
return err
}
close := (ref.RefAction == references.XRefActionCloses)
if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil {
return err
if close != ref.Issue.IsClosed {
if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil {
return err
}
}
}