From 3b8b8a2ee35b5ca603f02d5eaeac8c3d7334353d Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Thu, 16 Nov 2017 22:22:38 -0500
Subject: pull_request: able to ignore whitespace when check conflict (#4834)

---
 routes/repo/setting.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'routes/repo/setting.go')

diff --git a/routes/repo/setting.go b/routes/repo/setting.go
index e66c29e6..61c8f311 100644
--- a/routes/repo/setting.go
+++ b/routes/repo/setting.go
@@ -147,6 +147,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) {
 		repo.ExternalTrackerFormat = f.TrackerURLFormat
 		repo.ExternalTrackerStyle = f.TrackerIssueStyle
 		repo.EnablePulls = f.EnablePulls
+		repo.PullsIgnoreWhitespace = f.PullsIgnoreWhitespace
 		repo.PullsAllowRebase = f.PullsAllowRebase
 
 		if err := models.UpdateRepository(repo, false); err != nil {
-- 
cgit v1.2.3