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
3dc2724d36
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23322)
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.
|
2 years ago |
| .. |
|
agit
|
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)
|
2 years ago |
|
asymkey
|
Refactor AssertExistsAndLoadBean to use generics (#20797)
|
3 years ago |
|
attachment
|
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)
|
2 years ago |
|
auth
|
refactor auth interface to return error when verify failure (#22119) (#22259)
|
2 years ago |
|
automerge
|
Add force_merge to merge request and fix checking mergable (#23010) (#23032)
|
2 years ago |
|
comments
|
Move issues related files into models/issues (#19931)
|
3 years ago |
|
context
|
…
|
|
|
cron
|
Refactor git command arguments and make all arguments to be safe to be used (#21535)
|
2 years ago |
|
externalaccount
|
…
|
|
|
forms
|
Add force_merge to merge request and fix checking mergable (#23010) (#23032)
|
2 years ago |
|
gitdiff
|
Refactor git command arguments and make all arguments to be safe to be used (#21535)
|
2 years ago |
|
issue
|
Fix issue not auto-closing when it includes a reference to a branch (#22514) (#22521)
|
2 years ago |
|
lfs
|
Prevent Authorization header for presigned LFS urls (#21531)
|
2 years ago |
|
mailer
|
Prevent multiple `To` recipients (#22566) (#22569)
|
2 years ago |
|
markup
|
Link mentioned user in markdown only if they are visible to viewer (#21554)
|
2 years ago |
|
migrations
|
Prevent duplicate labels when importing more than 99 (#22591) (#22598)
|
2 years ago |
|
mirror
|
Fill head commit to in payload when notifying push commits for mirroring (#23215) (#23291)
|
2 years ago |
|
org
|
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)
|
2 years ago |
|
packages
|
refactor auth interface to return error when verify failure (#22119) (#22259)
|
2 years ago |
|
pull
|
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23322)
|
2 years ago |
|
release
|
Revert "Do not send notifications for draft releases (#21451)" (#21594)
|
2 years ago |
|
repository
|
Return empty url for submodule tree entries (#23043) (#23048)
|
2 years ago |
|
task
|
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)
|
2 years ago |
|
user
|
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)
|
2 years ago |
|
webhook
|
Fix wechatwork webhook sends empty content in PR review (#21762) (#22440)
|
2 years ago |
|
wiki
|
Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)
|
2 years ago |
