Browse Source

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

tags/v1.11.0-rc2
guillep2k 6 years ago committed by techknowlogick
parent
commit
ff16099c6d
  1. 6
      modules/repofiles/action.go
  2. 2
      services/pull/merge.go

6
modules/repofiles/action.go

@ -137,12 +137,14 @@ func UpdateIssuesCommit(doer *models.User, repo *models.Repository, commits []*m
continue
}
}
if err := changeIssueStatus(refRepo, refIssue, doer, ref.Action == references.XRefActionCloses); err != nil {
close := (ref.Action == references.XRefActionCloses)
if close != refIssue.IsClosed {
if err := changeIssueStatus(refRepo, refIssue, doer, close); err != nil {
return err
}
}
}
}
return nil
}

2
services/pull/merge.go

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

Loading…
Cancel
Save