11 Commits

Author	SHA1	Message	Date
sillyguodong	e8e871b44e	Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324) ... 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.  --------- Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>	2023-03-07 18:47:23 +08:00
Giteabot	4c1e24864f	Order pull request conflict checking by recently updated, for each push (#23220) (#23225) ... Backport #23220 When a change is pushed to the default branch and many pull requests are open for that branch, conflict checking can take some time. Previously it would go from oldest to newest pull request. Now prioritize pull requests that are likely being actively worked on or prepared for merging. This only changes the order within one push to one repository, but the change is trivial and can already be quite helpful for smaller Gitea instances where a few repositories have most pull requests. A global order would require deeper changes to queues. Co-authored-by: Brecht Van Lommel <brecht@blender.org> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>	2023-03-02 13:12:41 +08:00
Jason Song	d74d16a4b1	Set PR for issue when load attributes for PRs (#22766) ... A missing patch for #22650.	2023-02-05 08:24:43 -06:00
Jason Song	c18a62279a	Fix time to NotifyPullRequestSynchronized (#22650) ... Should call `PushToBaseRepo` before `notification.NotifyPullRequestSynchronized`. Or the notifier will get an old commit when reading branch `pull/xxx/head`. Found by ~#21937~ #22679. Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>	2023-02-05 19:57:38 +08:00
Lunny Xiao	4e946e5a7d	Small refactor for loading PRs (#22652)	2023-02-01 21:49:28 -06:00
Lunny Xiao	db2286bbb6	some refactor about code comments (#20821)	2023-01-17 15:03:44 -06:00
flynnnnnnnnnn	e81ccc406b	Implement FSFE REUSE for golang files (#21840) ... Change all license headers to comply with REUSE specification. Fix #16132 Co-authored-by: flynnnnnnnnnn <flynnnnnnnnnn@github> Co-authored-by: John Olheiser <john.olheiser@gmail.com>	2022-11-27 18:20:29 +00:00
KN4CK3R	044c754ea5	Add `context.Context` to more methods (#21546) ... This PR adds a context parameter to a bunch of methods. Some helper `xxxCtx()` methods got replaced with the normal name now. Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>	2022-11-19 16:12:33 +08:00
delvh	0ebb45cfe7	Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) ... Found using `find . -type f -name '*.go' -print -exec vim {} -c ':%s/fmt\.Errorf(\(.*\)%v\(.*\)err/fmt.Errorf(\1%w\2err/g' -c ':wq' \;` Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>	2022-10-24 20:29:17 +01:00
luzpaz	d29d6d1991	Fix various typos (#20338) ... * Fix various typos Found via `codespell -q 3 -S ./options/locale,./options/license,./public/vendor -L actived,allways,attachements,ba,befores,commiter,pullrequest,pullrequests,readby,splitted,te,unknwon` Co-authored-by: zeripath <art27@cantab.net>	2022-07-12 23:32:37 +02:00
Lunny Xiao	1a9821f57a	Move issues related files into models/issues (#19931) ... * Move access and repo permission to models/perm/access * fix test * fix git test * Move functions sequence * Some improvements per @KN4CK3R and @delvh * Move issues related code to models/issues * Move some issues related sub package * Merge * Fix test * Fix test * Fix test * Fix test * Rename some files	2022-06-13 17:37:59 +08:00

Renamed from models/pull_list.go (Browse further)