This repository has been archived on 2024-01-04. You can view files and clone it, but cannot push or open issues or pull requests.
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>
|
2023-03-07 18:47:23 +08:00 |
| .. |
|
admin
|
Fix missed `.hide` class (#23208) (#23237)
|
2023-03-02 11:45:42 -06:00 |
|
api/packages/pypi
|
…
|
|
|
base
|
Fix various bugs for "install" page (#23194) (#23286)
|
2023-03-05 11:59:58 +01:00 |
|
code
|
…
|
|
|
custom
|
…
|
|
|
explore
|
…
|
|
|
mail
|
Revert relative links to absolute links in mail templates (#23267) (#23269)
|
2023-03-03 17:41:00 +00:00 |
|
org
|
Fix incorrect project links and use symlink icon for org-wide projects (#23325) (#23336)
|
2023-03-06 13:48:04 -06:00 |
|
package
|
Fix nil context in RenderMarkdownToHtml (#23092) (#23108)
|
2023-02-24 21:17:03 +08:00 |
|
projects
|
Fix incorrect project links and use symlink icon for org-wide projects (#23325) (#23336)
|
2023-03-06 13:48:04 -06:00 |
|
repo
|
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324)
|
2023-03-07 18:47:23 +08:00 |
|
shared
|
Fix incorrect project links and use symlink icon for org-wide projects (#23325) (#23336)
|
2023-03-06 13:48:04 -06:00 |
|
status
|
…
|
|
|
swagger
|
Add scopes to API to create token and display them (#22989)
|
2023-02-20 15:28:44 -06:00 |
|
user
|
Fix incorrect project links and use symlink icon for org-wide projects (#23325) (#23336)
|
2023-03-06 13:48:04 -06:00 |
|
home.tmpl
|
…
|
|
|
install.tmpl
|
…
|
|
|
post-install.tmpl
|
Fix various bugs for "install" page (#23194) (#23286)
|
2023-03-05 11:59:58 +01:00 |
