tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-12-07 13:28:25 +00:00
Code Releases Activity

More improvements

Browse Source
This commit is contained in:
Lunny Xiao
2024-11-10 13:29:12 -08:00
parent 406884a6f4
commit ed261f1403
7 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/pull/merge.go
+6 -2
View File
@@ -242,14 +242,18 @@ func handleCloseCrossReferences(ctx context.Context, pr *issues_model.PullReques
if err = ref.Issue.LoadRepo(ctx); err != nil {
return err
}
isClosed := ref.RefAction == references.XRefActionCloses
if isClosed && !ref.Issue.IsClosed {
closeOrReopen := ref.RefAction == references.XRefActionCloses
if closeOrReopen && !ref.Issue.IsClosed {
if err = issue_service.CloseIssue(ctx, ref.Issue, doer, pr.MergedCommitID); err != nil {
// Allow ErrDependenciesLeft
if !issues_model.IsErrDependenciesLeft(err) {
return err
}
}
} else if !closeOrReopen && ref.Issue.IsClosed {
if err = issue_service.ReopenIssue(ctx, ref.Issue, doer, pr.MergedCommitID); err != nil {
return err
}
}
}
return nil