tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-11-21 21:58:21 +00:00
Code Releases Activity

Revert

Browse Source
This commit is contained in:
Zettat123
2024-04-28 14:26:25 +08:00
parent a02791ffe2
commit 6bf388bdd7
12 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
models/issues/pull.go
View File

@@ -499,6 +499,10 @@ func (pr *PullRequest) SetMerged(ctx context.Context) (bool, error) {
return false, err
}
if _, err := changeIssueStatus(ctx, pr.Issue, pr.Merger, true, true); err != nil {
return false, fmt.Errorf("Issue.changeStatus: %w", err)
}
// reset the conflicted files as there cannot be any if we're merged
pr.ConflictedFiles = []string{}