Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Retarget depending pulls when the parent branch is deleted #28686

Merged
merged 17 commits into from
Jan 17, 2024
Merged

Retarget depending pulls when the parent branch is deleted #28686

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1fd16f9
Try to keep branch PRs open when branch is deleted cause of it's PR m…
kvaster May 8, 2022
badb941
Make retarget optional, keep default behaviour without option
kvaster May 8, 2022
79e7630
Cleanup error handling, add docs
kvaster Mar 26, 2023
edfb3a3
Docs and logs cleanup
kvaster Mar 26, 2023
64a2019
Rebase to main, do not load all issue atributes - repo is enough
kvaster Jan 3, 2024
d8b13f1
Update modules/setting/repository.go
denyskon Jan 15, 2024
fe010bd
Update docs/content/administration/config-cheat-sheet.en-us.md
denyskon Jan 15, 2024
e2cfe09
Update custom/conf/app.example.ini
denyskon Jan 15, 2024
8cd0837
Merge branch 'main' into rebase-prs-onmerge
denyskon Jan 15, 2024
6a70807
Update services/pull/pull.go
denyskon Jan 16, 2024
a40ecaf
Merge branch 'main' into rebase-prs-onmerge
denyskon Jan 16, 2024
5b2e813
add test
denyskon Jan 16, 2024
05ea478
make fmt
denyskon Jan 16, 2024
48d7451
Update docs/content/administration/config-cheat-sheet.en-us.md
denyskon Jan 16, 2024
ea60e58
Update custom/conf/app.example.ini
denyskon Jan 16, 2024
0f6cdda
add don't retarget test
denyskon Jan 16, 2024
ca60f1d
Merge branch 'main' into rebase-prs-onmerge
GiteaBot Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update docs/content/administration/config-cheat-sheet.en-us.md
  • Loading branch information
@denyskon
denyskon authored Jan 15, 2024
commit fe010bd175611804e3ae6eed04bad30fe338d288
2 changes: 1 addition & 1 deletion docs/content/administration/config-cheat-sheet.en-us.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ In addition, there is _`StaticRootPath`_ which can be set as a built-in at build
- `POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES`: **false**: In default squash-merge messages include the commit message of all commits comprising the pull request.
- `ADD_CO_COMMITTER_TRAILERS`: **true**: Add co-authored-by and co-committed-by trailers to merge commit messages if committer does not match author.
- `TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY`: **false**: PR patches are tested using a three-way merge method to discover if there are conflicts. If this setting is set to **true**, conflicting patches will be retested using `git apply` - This was the previous behaviour in 1.18 (and earlier) but is somewhat inefficient. Please report if you find that this setting is required.
- `RETARGET_CHILDREN_ON_MERGE`: **false**: Retarget child pull requests to the parent pull request branch target on merge of parent pull request.
- `RETARGET_CHILDREN_ON_MERGE`: **true**: Retarget child pull requests to the parent pull request branch target on merge of parent pull request.
denyskon marked this conversation as resolved.
Show resolved Hide resolved

### Repository - Issue (`repository.issue`)

Expand Down
Loading