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