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
2f49b55c19
Fix cannot reopen after pushing commits to a closed PR (#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 too long names for actions (#23162)
|
2 years ago |
|
activities
|
Add pagination for dashboard and user activity feeds (#22937)
|
2 years ago |
|
admin
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
asymkey
|
Refactor the setting to make unit test easier (#22405)
|
2 years ago |
|
auth
|
Use minio/sha256-simd for accelerated SHA256 (#23052)
|
2 years ago |
|
avatars
|
Avoid warning for system setting when start up (#23054)
|
2 years ago |
|
db
|
Fix db.Find bug (#23115)
|
2 years ago |
|
dbfs
|
Refactor the setting to make unit test easier (#22405)
|
2 years ago |
|
fixtures
|
Use correct README link to render the README (#23152)
|
2 years ago |
|
git
|
Rename `repo.GetOwner` to `repo.LoadOwner` (#22967)
|
2 years ago |
|
issues
|
Fix cannot reopen after pushing commits to a closed PR (#23189)
|
2 years ago |
|
migrations
|
Require approval to run actions for fork pull request (#22803)
|
2 years ago |
|
organization
|
Rename `GetUnits` to `LoadUnits` (#22970)
|
2 years ago |
|
packages
|
Use link in UI which returned a relative url but not html_url which contains an absolute url (#21986)
|
2 years ago |
|
perm
|
Rename `repo.GetOwner` to `repo.LoadOwner` (#22967)
|
2 years ago |
|
project
|
improve FindProjects (#23085)
|
2 years ago |
|
pull
|
refactor some functions to support ctx as first parameter (#21878)
|
2 years ago |
|
repo
|
Rename `repo.GetOwner` to `repo.LoadOwner` (#22967)
|
2 years ago |
|
secret
|
Secrets storage with SecretKey encrypted (#22142)
|
2 years ago |
|
system
|
Avoid warning for system setting when start up (#23054)
|
2 years ago |
|
unit
|
Repositories: by default disable all units except code and pulls on forks (#22541)
|
2 years ago |
|
unittest
|
Avoid warning for system setting when start up (#23054)
|
2 years ago |
|
user
|
Avoid warning for system setting when start up (#23054)
|
2 years ago |
|
webhook
|
Support system hook API (#14537)
|
2 years ago |
|
error.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
fixture_generation.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
fixture_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
main_test.go
|
Refactor the setting to make unit test easier (#22405)
|
2 years ago |
|
migrate.go
|
Check primary keys for all tables and drop ForeignReference (#21721)
|
2 years ago |
|
migrate_test.go
|
Check primary keys for all tables and drop ForeignReference (#21721)
|
2 years ago |
|
org.go
|
refactor some functions to support ctx as first parameter (#21878)
|
2 years ago |
|
org_team.go
|
Supports wildcard protected branch (#20825)
|
2 years ago |
|
org_team_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
org_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
repo.go
|
Avoid warning for system setting when start up (#23054)
|
2 years ago |
|
repo_collaboration.go
|
refactor some functions to support ctx as first parameter (#21878)
|
2 years ago |
|
repo_collaboration_test.go
|
Rename `repo.GetOwner` to `repo.LoadOwner` (#22967)
|
2 years ago |
|
repo_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
repo_transfer.go
|
Always reuse transaction (#22362)
|
2 years ago |
|
repo_transfer_test.go
|
Rename almost all Ctx functions (#22071)
|
2 years ago |
