diff options
| author | yp05327 <576951401@qq.com> | 2023-07-16 07:10:49 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-15 22:10:49 +0000 |
| commit | ec35af470c8cbed9f32b68e1a2c43e0f71c5f97b (patch) | |
| tree | 38022b01637e704995b3996afe76286281d7d917 /routers | |
| parent | d473de0c2d9226f59a1a4de92057f3fd5c7fe456 (diff) | |
| download | gitea-ec35af470c8cbed9f32b68e1a2c43e0f71c5f97b.tar.gz gitea-ec35af470c8cbed9f32b68e1a2c43e0f71c5f97b.zip | |
Avoid opening/closing PRs which are already merged (#25883)
We can select PRs to open/close them by one click, but we forgot to
check whether it is merged.
You can get an opening merged PR:
You can confirm this in:
https://try.gitea.io/yp05327/testrepo/pulls/5
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/web/repo/issue.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 31bcbd7c21..bd8959846c 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -2762,7 +2762,15 @@ func UpdateIssueStatus(ctx *context.Context) { ctx.ServerError("LoadRepositories", err) return } + if err := issues.LoadPullRequests(ctx); err != nil { + ctx.ServerError("LoadPullRequests", err) + return + } + for _, issue := range issues { + if issue.IsPull && issue.PullRequest.HasMerged { + continue + } if issue.IsClosed != isClosed { if err := issue_service.ChangeStatus(issue, ctx.Doer, "", isClosed); err != nil { if issues_model.IsErrDependenciesLeft(err) { |