From 34c2e52bd5523a2c6bafd5026817c8d51387f370 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Wed, 15 Nov 2017 23:27:52 -0500
Subject: repo/pull: allow rebase before merging (#4805)

---
 pkg/form/repo.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkg/form/repo.go')

diff --git a/pkg/form/repo.go b/pkg/form/repo.go
index 483076ce..32c5effc 100644
--- a/pkg/form/repo.go
+++ b/pkg/form/repo.go
@@ -102,7 +102,7 @@ type RepoSetting struct {
 	TrackerURLFormat      string
 	TrackerIssueStyle     string
 	EnablePulls           bool
-	PullUseRebase         bool
+	PullsAllowRebase      bool
 }
 
 func (f *RepoSetting) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
-- 
cgit v1.2.3