kevadesu/forgejo
1
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-03 18:02:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

1
services/forms/repo_form.go
View file

@ -151,6 +151,7 @@ type RepoSettingForm struct {
PullsAllowManualMerge bool
PullsDefaultMergeStyle string
EnableAutodetectManualMerge bool
PullsAllowRebaseUpdate bool
DefaultDeleteBranchAfterMerge bool
EnableTimetracker bool
AllowOnlyContributorsToTrackTime bool