diff options
Diffstat (limited to 'modules/auth/repo_form.go')
| -rw-r--r-- | modules/auth/repo_form.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index f865061374..a600ecc8fe 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -112,6 +112,7 @@ type RepoSettingForm struct { PullsIgnoreWhitespace bool PullsAllowMerge bool PullsAllowRebase bool + PullsAllowRebaseMerge bool PullsAllowSquash bool EnableTimetracker bool AllowOnlyContributorsToTrackTime bool @@ -363,7 +364,7 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error // MergePullRequestForm form for merging Pull Request type MergePullRequestForm struct { - Do string `binding:"Required;In(merge,rebase,squash)"` + Do string `binding:"Required;In(merge,rebase,rebase-merge,squash)"` MergeTitleField string MergeMessageField string } |