forgejo-federation/services
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 Fix schedule tasks bugs (#28691) 2024-01-12 21:50:38 +00:00
agit Adjust object format interface (#28469) 2023-12-17 11:56:08 +00:00
asymkey Move more functions to db.Find (#28419) 2024-01-15 02:19:25 +00:00
attachment Even more db.DefaultContext refactor (#27352) 2023-10-03 10:30:41 +00:00
auth Refactor timeutil package (#28623) 2023-12-28 10:09:57 +00:00
automerge Improve queue and logger context (#24924) 2023-05-26 07:31:55 +00:00
context Another round of db.DefaultContext refactor (#27103) 2023-09-25 13:17:37 +00:00
convert Add branch protection setting for ignoring stale approvals (#28498) 2024-01-15 07:20:01 +00:00
cron Update go dependencies (#28518) 2023-12-19 09:18:42 +08:00
externalaccount Final round of db.DefaultContext refactor (#27587) 2023-10-14 08:37:24 +00:00
feed More db.DefaultContext refactor (#27265) 2023-09-29 12:12:54 +00:00
forms 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
gitdiff Add option to disable ambiguous unicode characters detection (#28454) 2023-12-17 14:38:54 +00:00
indexer Fix missing issue search index update when changing status (#28325) 2023-12-03 12:22:44 +01:00
issue Remove deadcode under models/issues (#28536) 2023-12-19 20:12:02 +01:00
lfs Remove GetByBean method because sometimes it's danger when query condition parameter is zero and also introduce new generic methods (#28220) 2023-12-07 15:27:36 +08:00
mailer Rework markup link rendering (#26745) 2024-01-15 08:49:24 +00:00
markup make writing main test easier (#27270) 2023-09-28 01:38:53 +00:00
migrations Move more functions to db.Find (#28419) 2024-01-15 02:19:25 +00:00
mirror Refactor deletion (#28610) 2023-12-25 21:25:29 +01:00
notify Update status and code index after changing the default branch (#27018) 2023-09-13 04:43:31 +00:00
org Delete repos of org when purge delete user (#27273) 2023-10-19 13:16:11 +00:00
packages Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
pull Retarget depending pulls when the parent branch is deleted (#28686) 2024-01-17 01:44:56 +01:00
release Refactor deletion (#28610) 2023-12-25 21:25:29 +01:00
repository Fix reverting a merge commit failing (#28794) 2024-01-16 15:06:51 +00:00
secrets Refactor deletion (#28610) 2023-12-25 21:25:29 +01:00
task Fix incorrect ctx usage in defer function (#27740) 2023-10-22 14:12:27 +00:00
uinotification Penultimate round of db.DefaultContext refactor (#27414) 2023-10-11 04:24:07 +00:00
user Forbid removing the last admin user (#28337) 2024-01-15 06:51:43 +00:00
webhook Abstract hash function usage (#28138) 2023-12-13 21:02:00 +00:00
wiki Fix schedule tasks bugs (#28691) 2024-01-12 21:50:38 +00:00