Git with a cup of tea, painless self-hosted git service
Mirror for internal git.with.parts use
https://git.with.parts
You can not 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 |
| .. |
|
fields
|
Fix nil context in RenderMarkdownToHtml (#23092)
|
2 years ago |
|
labels
|
Refactor `ctx` in templates (#23105)
|
2 years ago |
|
view_content
|
Fix cannot reopen after pushing commits to a closed PR (#23189)
|
2 years ago |
|
branch_selector_field.tmpl
|
Refactor hiding-methods, remove jQuery show/hide, remove `.hide` class, remove inline style=display:none (#22950)
|
2 years ago |
|
choose.tmpl
|
Add main landmark to templates and adjust titles (#22670)
|
2 years ago |
|
comment_tab.tmpl
|
Fix nil context in RenderMarkdownToHtml (#23092)
|
2 years ago |
|
label_precolors.tmpl
|
Fix purple color in suggested label colors (#18241)
|
3 years ago |
|
labels.tmpl
|
Add main landmark to templates and adjust titles (#22670)
|
2 years ago |
|
list.tmpl
|
Add "Reviewed by you" filter for pull requests (#22927)
|
2 years ago |
|
milestone_issues.tmpl
|
Add "Reviewed by you" filter for pull requests (#22927)
|
2 years ago |
|
milestone_new.tmpl
|
Add main landmark to templates and adjust titles (#22670)
|
2 years ago |
|
milestones.tmpl
|
Move helpers to be prefixed with `gt-` (#22879)
|
2 years ago |
|
navbar.tmpl
|
Add some headings to repo views (#22869)
|
2 years ago |
|
new.tmpl
|
Add main landmark to templates and adjust titles (#22670)
|
2 years ago |
|
new_form.tmpl
|
Refactor `ctx` in templates (#23105)
|
2 years ago |
|
openclose.tmpl
|
Move helpers to be prefixed with `gt-` (#22879)
|
2 years ago |
|
search.tmpl
|
Issues: add Project filter to issues list and search (#22544)
|
2 years ago |
|
view.tmpl
|
Add main landmark to templates and adjust titles (#22670)
|
2 years ago |
|
view_content.tmpl
|
Refactor `ctx` in templates (#23105)
|
2 years ago |
|
view_title.tmpl
|
Fix pull request branch selector visible without clicking Edit (#23012)
|
2 years ago |
