diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/repo_unit.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/models/repo_unit.go b/models/repo_unit.go index d8060d16a0..a12e056a7d 100644 --- a/models/repo_unit.go +++ b/models/repo_unit.go @@ -91,14 +91,15 @@ func (cfg *IssuesConfig) ToDB() ([]byte, error) { // PullRequestsConfig describes pull requests config type PullRequestsConfig struct { - IgnoreWhitespaceConflicts bool - AllowMerge bool - AllowRebase bool - AllowRebaseMerge bool - AllowSquash bool - AllowManualMerge bool - AutodetectManualMerge bool - DefaultMergeStyle MergeStyle + IgnoreWhitespaceConflicts bool + AllowMerge bool + AllowRebase bool + AllowRebaseMerge bool + AllowSquash bool + AllowManualMerge bool + AutodetectManualMerge bool + DefaultDeleteBranchAfterMerge bool + DefaultMergeStyle MergeStyle } // FromDB fills up a PullRequestsConfig from serialized format. |