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>
|
1 year ago |
| .. |
|
admin
|
Fix missed `.hide` class (#23208)
|
1 year ago |
|
api/packages/pypi
|
Add Package Registry (#16510)
|
2 years ago |
|
base
|
Add accessibility to the menu on the navbar (#23059)
|
1 year ago |
|
code
|
Remove Fomantic-UI's `.hidden` CSS class for menu elements (#22895)
|
1 year ago |
|
custom
|
Add footer extra links template (#9576)
|
5 years ago |
|
explore
|
Add context cache as a request level cache (#22294)
|
1 year ago |
|
mail
|
Use link in UI which returned a relative url but not html_url which contains an absolute url (#21986)
|
1 year ago |
|
org
|
Hide 2FA status from other members in organization members list (#22999)
|
1 year ago |
|
package
|
Fix nil context in RenderMarkdownToHtml (#23092)
|
1 year ago |
|
projects
|
Projects: rename Board to Column in interface and improve consistency (#22767)
|
1 year ago |
|
repo
|
Fix cannot reopen after pushing commits to a closed PR (#23189)
|
1 year ago |
|
shared
|
Fix no user listed in org teams page (#22979)
|
1 year ago |
|
status
|
Move helpers to be prefixed with `gt-` (#22879)
|
1 year ago |
|
swagger
|
Add "Reviewed by you" filter for pull requests (#22927)
|
1 year ago |
|
user
|
Fix incorrect checkbox behaviors in the dashboard repolist's filter (#23147)
|
1 year ago |
|
home.tmpl
|
Add main landmark to templates and adjust titles (#22670)
|
1 year ago |
|
install.tmpl
|
Refactor hiding-methods, remove jQuery show/hide, remove `.hide` class, remove inline style=display:none (#22950)
|
1 year ago |
|
post-install.tmpl
|
Introduce customized HTML elements, fix incorrect AppUrl usages in templates (#22861)
|
1 year ago |
