web/forgejo
10
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-03 17:04:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Add config option to disable "Update branch by rebase" (#18745)

Browse source
This commit is contained in:
Jimmy Praet 2022-03-04 09:30:49 +01:00 • committed by GitHub
parent 3c7201682c
commit 5184c83f6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/repo.go
View file

@ -521,7 +521,7 @@ func CreateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_
units = append(units, repo_model.RepoUnit{
RepoID: repo.ID,
Type: tp,
Config: &repo_model.PullRequestsConfig{AllowMerge: true, AllowRebase: true, AllowRebaseMerge: true, AllowSquash: true, DefaultMergeStyle: repo_model.MergeStyleMerge},
Config: &repo_model.PullRequestsConfig{AllowMerge: true, AllowRebase: true, AllowRebaseMerge: true, AllowSquash: true, DefaultMergeStyle: repo_model.MergeStyleMerge, AllowRebaseUpdate: true},
})
} else {
units = append(units, repo_model.RepoUnit{