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
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.
![image](https://user-images.githubusercontent.com/33891828/222037529-651fccf9-0bba-433e-b2f0-79c17e0cc812.png)
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.
![image](https://user-images.githubusercontent.com/33891828/222621045-bb80987c-10c5-4eac-aa0c-1fb9c6aefb51.png)
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.
![image](https://user-images.githubusercontent.com/33891828/222058913-c91cf3e3-819b-40c5-8015-654b31eeccff.png)
e.g.
1). The initial status of the PR is opened.
![image](https://user-images.githubusercontent.com/33891828/222453617-33c5093e-f712-4cd6-8489-9f87e2075869.png)
2). Then I click the button of `Close`. PR is closed now.
![image](https://user-images.githubusercontent.com/33891828/222453694-25c588a9-c121-4897-9ae5-0b13cf33d20b.png)
3). I try to push a commit to this PR, even though its current status is
closed.
![image](https://user-images.githubusercontent.com/33891828/222453916-361678fb-7321-410d-9e37-5a26e8095638.png)
But in comments list, this commit do not display.This is as expected :)
![image](https://user-images.githubusercontent.com/33891828/222454169-7617a791-78d2-404e-be5e-77d555f93313.png)
4). Click the `Reopen` button, the commit which is pushed after closing
PR display now.
![image](https://user-images.githubusercontent.com/33891828/222454533-897893b6-b96e-4701-b5cb-b1800f382b8f.png)
|
2023-03-06 11:38:45 -06:00 |
.. |
admin
|
Provide the ability to set password hash algorithm parameters (#22942) (#22943)
|
2023-02-19 15:35:52 +08:00 |
auth
|
Provide the ability to set password hash algorithm parameters (#22942) (#22943)
|
2023-02-19 15:35:52 +08:00 |
dev
|
Make better use of i18n (#20096)
|
2022-06-26 22:19:22 +08:00 |
events
|
Improve Stopwatch behavior (#18930)
|
2022-04-25 22:45:22 +02:00 |
explore
|
Fix sorting admin user list by last login (#22081) (#22107)
|
2022-12-13 16:37:33 -06:00 |
feed
|
Fix setting HTTP headers after write (#21833) (#21877)
|
2022-11-22 09:00:42 +08:00 |
healthcheck
|
Update go-chi/cache to utilize Ping() (#19719)
|
2022-05-15 20:43:27 +02:00 |
misc
|
Fix panic in team repos API (#19431)
|
2022-04-20 18:43:26 +08:00 |
org
|
Fix leaving organization bug on user settings -> orgs (#21983) (#22438)
|
2023-01-16 01:29:27 +02:00 |
repo
|
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23322)
|
2023-03-06 11:38:45 -06:00 |
user
|
Provide the ability to set password hash algorithm parameters (#22942) (#22943)
|
2023-02-19 15:35:52 +08:00 |
auth.go
|
Remove legacy `+build:` constraint (#19582)
|
2022-05-02 23:22:45 +08:00 |
auth_windows.go
|
Let web and API routes have different auth methods group (#19168)
|
2022-03-28 12:46:28 +08:00 |
base.go
|
Share HTML template renderers and create a watcher framework (#20218)
|
2022-08-28 10:43:25 +01:00 |
goget.go
|
Refactor legacy `unknwon/com` package, improve golangci lint (#19284)
|
2022-04-01 16:47:50 +08:00 |
home.go
|
Add sitemap support (#18407)
|
2022-06-25 19:06:01 +02:00 |
metrics.go
|
Update HTTP status codes to modern codes (#18063)
|
2022-03-23 12:54:07 +08:00 |
nodeinfo.go
|
Add nodeinfo endpoint for federation purposes (#16953)
|
2021-09-28 01:38:06 +02:00 |
swagger_json.go
|
Refactor routers directory (#15800)
|
2021-06-09 01:33:54 +02:00 |
web.go
|
Fix permission check on issue/pull lock (#22113)
|
2022-12-12 20:59:50 +01:00 |
webfinger.go
|
Fix various typos (#20338)
|
2022-07-12 23:32:37 +02:00 |