You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
sillyguodong
e8e871b44e
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324)
Backport: #23189
Close: #22784
1. On GH, we can reopen a PR which was closed before after pushing
commits. After reopening PR, we can see the commits that were pushed
after closing PR in the time line. So the case of
[issue](https://github.com/go-gitea/gitea/issues/22784) is a bug which
needs to be fixed.
2. After closing a PR and pushing commits, `headBranchSha` is not equal
to `sha`(which is the last commit ID string of reference). If the
judgement exists, the button of reopen will not display. So, skip the
judgement if the status of PR is closed.
3. Even if PR is already close, we should still insert comment record
into DB when we push commits.
So we should still call function `CreatePushPullComment()`.
067b0c2664/services/pull/pull.go (L260-L282)
So, I add a switch(`includeClosed`) to the
`GetUnmergedPullRequestsByHeadInfo` func to control whether the status
of PR must be open. In this case, by setting `includeClosed` to `true`,
we can query the closed PR.
4. In the loop of comments, I use the`latestCloseCommentID` variable to
record the last occurrence of the close comment.
In the go template, if the status of PR is closed, the comments whose
type is `CommentTypePullRequestPush(29)` after `latestCloseCommentID`
won't be rendered.
e.g.
1). The initial status of the PR is opened.
2). Then I click the button of `Close`. PR is closed now.
3). I try to push a commit to this PR, even though its current status is
closed.
But in comments list, this commit do not display.This is as expected ：）
4). Click the `Reopen` button, the commit which is pushed after closing
PR display now.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
|
2 years ago |
| .. |
|
actions
|
Avoid panic caused by broken payload when creating commit status (#23216) (#23294)
|
2 years ago |
|
activity.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
attachment.go
|
Add API management for issue/pull and comment attachments (#21783)
|
2 years ago |
|
blame.go
|
Add context cache as a request level cache (#22294)
|
2 years ago |
|
branch.go
|
Supports wildcard protected branch (#20825)
|
2 years ago |
|
cherry_pick.go
|
Rename almost all Ctx functions (#22071)
|
2 years ago |
|
commit.go
|
Add context cache as a request level cache (#22294)
|
2 years ago |
|
compare.go
|
Use beforeCommit instead of baseCommit (#22949)
|
2 years ago |
|
download.go
|
Use context parameter in models/git (#22367)
|
2 years ago |
|
editor.go
|
Rename almost all Ctx functions (#22071)
|
2 years ago |
|
editor_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
find.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
http.go
|
Return 404 instead of 403 if user can not access the repo (#23155) (#23158)
|
2 years ago |
|
http_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
issue.go
|
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324)
|
2 years ago |
|
issue_content_history.go
|
Move helpers to be prefixed with `gt-` (#22879)
|
2 years ago |
|
issue_dependency.go
|
Fix improper HTMLURL usages in Go code (#22839)
|
2 years ago |
|
issue_label.go
|
Add loading yaml label template files (#22976) (#23232)
|
2 years ago |
|
issue_label_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
issue_lock.go
|
Fix improper HTMLURL usages in Go code (#22839)
|
2 years ago |
|
issue_stopwatch.go
|
Fix improper HTMLURL usages in Go code (#22839)
|
2 years ago |
|
issue_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
issue_timetrack.go
|
Fix improper HTMLURL usages in Go code (#22839)
|
2 years ago |
|
issue_watch.go
|
Fix improper HTMLURL usages in Go code (#22839)
|
2 years ago |
|
lfs.go
|
Refactor git command package to improve security and maintainability (#22678)
|
2 years ago |
|
main_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
middlewares.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
migrate.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
milestone.go
|
Rename almost all Ctx functions (#22071)
|
2 years ago |
|
packages.go
|
Use dynamic package type list (#22263)
|
2 years ago |
|
patch.go
|
Redirect to the commit page after applying patch (#23056) (#23127)
|
2 years ago |
|
projects.go
|
Preview images for Issue cards in Project Board view (#22112)
|
2 years ago |
|
projects_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
pull.go
|
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324)
|
2 years ago |
|
pull_review.go
|
Fix improper HTMLURL usages in Go code (#22839)
|
2 years ago |
|
release.go
|
Fix improper HTMLURL usages in Go code (#22839)
|
2 years ago |
|
release_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
render.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
repo.go
|
Fix improper HTMLURL usages in Go code (#22839)
|
2 years ago |
|
runners.go
|
Implement actions (#21937)
|
2 years ago |
|
search.go
|
Fix improper HTMLURL usages in Go code (#22839)
|
2 years ago |
|
setting.go
|
Rename `repo.GetOwner` to `repo.LoadOwner` (#22967)
|
2 years ago |
|
setting_protected_branch.go
|
Get rules by id when editing branch protection rule (#22932)
|
2 years ago |
|
setting_secrets.go
|
Add user secrets (#22191)
|
2 years ago |
|
settings_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
tag.go
|
Add main landmark to templates and adjust titles (#22670)
|
2 years ago |
|
topic.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
treelist.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
view.go
|
Use correct README link to render the README (#23152) (#23264)
|
2 years ago |
|
view_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
webhook.go
|
Add context cache as a request level cache (#22294)
|
2 years ago |
|
wiki.go
|
Use context parameter in models/git (#22367)
|
2 years ago |
|
wiki_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
