From 34c2e52bd5523a2c6bafd5026817c8d51387f370 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 15 Nov 2017 23:27:52 -0500 Subject: repo/pull: allow rebase before merging (#4805) --- routes/repo/setting.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'routes/repo/setting.go') diff --git a/routes/repo/setting.go b/routes/repo/setting.go index 8e244b6e..e66c29e6 100644 --- a/routes/repo/setting.go +++ b/routes/repo/setting.go @@ -147,7 +147,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { repo.ExternalTrackerFormat = f.TrackerURLFormat repo.ExternalTrackerStyle = f.TrackerIssueStyle repo.EnablePulls = f.EnablePulls - repo.PullUseRebase = f.PullUseRebase + repo.PullsAllowRebase = f.PullsAllowRebase if err := models.UpdateRepository(repo, false); err != nil { c.ServerError("UpdateRepository", err) -- cgit v1.2.3