diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-02-01 19:24:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-01 11:24:26 +0000 |
| commit | 107a694fd6cced86bec8ab61cff3c472cbee08f1 (patch) | |
| tree | 6fedc912a00c2b3974b916e5a317a333f7f13dd4 /services | |
| parent | 8d43563a320ded0ffc0b9d66020ed3451c187259 (diff) | |
| download | gitea-107a694fd6cced86bec8ab61cff3c472cbee08f1.tar.gz gitea-107a694fd6cced86bec8ab61cff3c472cbee08f1.zip | |
Fix IsErrPullClosed (#10093)
Diffstat (limited to 'services')
| -rw-r--r-- | services/pull/pull.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/pull/pull.go b/services/pull/pull.go index 3de2048a26..6e51ad0a24 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -407,7 +407,7 @@ func CloseBranchPulls(doer *models.User, repoID int64, branch string) error { var errs errlist for _, pr := range prs { - if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrIssueWasClosed(err) { + if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrPullWasClosed(err) { errs = append(errs, err) } } @@ -436,7 +436,7 @@ func CloseRepoBranchesPulls(doer *models.User, repo *models.Repository) error { } for _, pr := range prs { - if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrIssueWasClosed(err) { + if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrPullWasClosed(err) { errs = append(errs, err) } } |