tdsds.com/gitea
tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-10 12:14:25 +00:00
Code Releases Activity

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

Browse Source
This commit is contained in:
guillep2k 2020-01-11 03:42:11 -03:00 committed by techknowlogick
parent a516a7ba0f
commit ff16099c6d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/repofiles/action.go
View File

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

2
services/pull/merge.go
View File

@ -374,10 +374,12 @@ 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 close != ref.Issue.IsClosed {
if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil { if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil {
return err return err
} }
} }
}
return nil return nil
} }