forked from gitea/gitea
1
0
Fork 0
gitea/routers/web/repo
Viktor Kuzmin 49eb168677
Retarget depending pulls when the parent branch is deleted (#28686)
Sometimes you need to work on a feature which depends on another (unmerged) feature.
In this case, you may create a PR based on that feature instead of the main branch.
Currently, such PRs will be closed without the possibility to reopen in case the parent feature is merged and its branch is deleted.
Automatic target branch change make life a lot easier in such cases.
Github and Bitbucket behave in such way.

Example:
$PR_1$: main <- feature1
$PR_2$: feature1 <- feature2

Currently, merging $PR_1$ and deleting its branch leads to $PR_2$ being closed without the possibility to reopen.
This is both annoying and loses the review history when you open a new PR.

With this change, $PR_2$ will change its target branch to main ($PR_2$: main <- feature2) after $PR_1$ has been merged and its branch has been deleted.

This behavior is enabled by default but can be disabled.
For security reasons, this target branch change will not be executed when merging PRs targeting another repo. 

Fixes #27062
Fixes #18408

---------

Co-authored-by: Denys Konovalov <kontakt@denyskon.de>
Co-authored-by: delvh <dev.lh@web.de>
2024-01-17 01:44:56 +01:00
..
actions Only check online runner when detecting matching runners in workflows (#28286) 2023-12-18 16:06:19 +00:00
setting Add branch protection setting for ignoring stale approvals (#28498) 2024-01-15 07:20:01 +00:00
activity.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
attachment.go Even more `db.DefaultContext` refactor (#27352) 2023-10-03 10:30:41 +00:00
blame.go Use information from previous blame parts (#28572) 2023-12-21 22:48:18 +01:00
branch.go Adjust object format interface (#28469) 2023-12-17 11:56:08 +00:00
cherry_pick.go Upgrade to golangci-lint@v1.55.0 (#27756) 2023-10-24 02:54:59 +00:00
commit.go Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
compare.go Assign pull request to project during creation (#28227) 2024-01-12 15:25:15 +00:00
download.go Less naked returns (#25713) 2023-07-07 05:31:56 +00:00
editor.go Revert "Fix EOL handling in web editor" (#28101) 2023-11-22 09:14:16 +00:00
editor_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00
find.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
githttp.go Adjust object format interface (#28469) 2023-12-17 11:56:08 +00:00
githttp_test.go Fix http protocol auth (#27875) 2023-11-02 22:14:33 +08:00
helper.go Improve tree not found page (#26570) 2023-09-29 07:42:39 +00:00
helper_test.go Make web context initialize correctly for different cases (#26726) 2023-08-25 19:07:42 +08:00
issue.go Add ability to see open and closed issues at the same time (#28757) 2024-01-15 15:07:22 +00:00
issue_content_history.go Fix missing check (#28406) 2023-12-10 21:37:10 +02:00
issue_dependency.go Upgrade to golangci-lint@v1.55.0 (#27756) 2023-10-24 02:54:59 +00:00
issue_label.go Even more `db.DefaultContext` refactor (#27352) 2023-10-03 10:30:41 +00:00
issue_label_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00
issue_lock.go Penultimate round of `db.DefaultContext` refactor (#27414) 2023-10-11 04:24:07 +00:00
issue_pin.go Fix missing check (#28406) 2023-12-10 21:37:10 +02:00
issue_stopwatch.go Final round of `db.DefaultContext` refactor (#27587) 2023-10-14 08:37:24 +00:00
issue_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_timetrack.go Final round of `db.DefaultContext` refactor (#27587) 2023-10-14 08:37:24 +00:00
issue_watch.go Next round of `db.DefaultContext` refactor (#27089) 2023-09-16 14:39:12 +00:00
main_test.go make writing main test easier (#27270) 2023-09-28 01:38:53 +00:00
middlewares.go Fix viewing wiki commit on empty repo (#28040) 2023-11-14 19:42:23 +08:00
migrate.go Next round of `db.DefaultContext` refactor (#27089) 2023-09-16 14:39:12 +00:00
milestone.go Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
packages.go Fix the display of org level badges (#26504) 2023-09-06 14:38:14 +08:00
patch.go Upgrade to golangci-lint@v1.55.0 (#27756) 2023-10-24 02:54:59 +00:00
projects.go Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
projects_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00
pull.go Retarget depending pulls when the parent branch is deleted (#28686) 2024-01-17 01:44:56 +01:00
pull_review.go More `db.DefaultContext` refactor (#27265) 2023-09-29 12:12:54 +00:00
release.go Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
release_test.go Move more functions to db.Find (#28419) 2024-01-15 02:19:25 +00:00
render.go Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
repo.go Remove trust model selection from repository creation on web page because it can be changed in settings later (#28814) 2024-01-16 20:54:48 +08:00
search.go Refactor indexer (#25174) 2023-06-23 12:37:56 +00:00
topic.go Next round of `db.DefaultContext` refactor (#27089) 2023-09-16 14:39:12 +00:00
treelist.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
view.go Show latest commit for file (#28067) 2024-01-15 17:42:15 +01:00
view_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
wiki.go Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
wiki_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00