diff options
author | Jimmy Praet <jimmy.praet@telenet.be> | 2022-03-04 09:30:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-04 03:30:49 -0500 |
commit | 5184c83f6b702aeec3ea85263e16ccf5ebe89836 (patch) | |
tree | d5a5f04630815a7342c6e26409faeac75620573b /modules/structs | |
parent | 3c7201682cde10ed551476e13e9e1bfdd971e0c0 (diff) | |
download | gitea-5184c83f6b702aeec3ea85263e16ccf5ebe89836.tar.gz gitea-5184c83f6b702aeec3ea85263e16ccf5ebe89836.zip |
Add config option to disable "Update branch by rebase" (#18745)
Diffstat (limited to 'modules/structs')
-rw-r--r-- | modules/structs/repo.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/structs/repo.go b/modules/structs/repo.go index 087ae941f4..27d0b4f3ba 100644 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -177,6 +177,8 @@ type EditRepoOption struct { AllowManualMerge *bool `json:"allow_manual_merge,omitempty"` // either `true` to enable AutodetectManualMerge, or `false` to prevent it. `has_pull_requests` must be `true`, Note: In some special cases, misjudgments can occur. AutodetectManualMerge *bool `json:"autodetect_manual_merge,omitempty"` + // either `true` to allow updating pull request branch by rebase, or `false` to prevent it. `has_pull_requests` must be `true`. + AllowRebaseUpdate *bool `json:"allow_rebase_update,omitempty"` // set to `true` to delete pr branch after merge by default DefaultDeleteBranchAfterMerge *bool `json:"default_delete_branch_after_merge,omitempty"` // set to a merge style to be used by this repository: "merge", "rebase", "rebase-merge", or "squash". `has_pull_requests` must be `true`. |