diff options
| author | Julian <julian.toelle97@gmail.com> | 2018-12-27 11:27:08 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2018-12-27 12:27:08 +0200 |
| commit | 4a685f8b872a3d4c101c5e8165fa99e696c8fb45 (patch) | |
| tree | 7ad36ee9bf87cec61ee0967a50037d9331d2ab58 /modules/auth/repo_form.go | |
| parent | 58bdff53cd98e33791f91584d02887864aabc5c4 (diff) | |
| download | gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.tar.gz gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.zip | |
Add rebase with merge commit merge style (#3844) (#4052)
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
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 } |