(cherry picked from commit 53586e9d60
)
This commit is contained in:
parent
459d708d27
commit
13341af69e
1 changed files with 7 additions and 0 deletions
|
@ -2654,6 +2654,13 @@ func UpdateIssueStatus(ctx *context.Context) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
for _, issue := range issues {
|
for _, issue := range issues {
|
||||||
|
if err := issue.LoadPullRequest(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadPullRequests", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if issue.IsPull && issue.PullRequest.HasMerged {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if issue.IsClosed != isClosed {
|
if issue.IsClosed != isClosed {
|
||||||
if err := issue_service.ChangeStatus(issue, ctx.Doer, "", isClosed); err != nil {
|
if err := issue_service.ChangeStatus(issue, ctx.Doer, "", isClosed); err != nil {
|
||||||
if issues_model.IsErrDependenciesLeft(err) {
|
if issues_model.IsErrDependenciesLeft(err) {
|
||||||
|
|
Loading…
Reference in a new issue