diff options
| author | Unknwon <u@gogs.io> | 2017-11-16 22:22:38 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2017-11-16 22:22:38 -0500 |
| commit | 3b8b8a2ee35b5ca603f02d5eaeac8c3d7334353d (patch) | |
| tree | 7c8486a3e82b20df34e1df316643aa32107f87a7 /routes/repo/setting.go | |
| parent | 6f04ee879ca25fd798f85a4c701291adae561a1a (diff) | |
pull_request: able to ignore whitespace when check conflict (#4834)
Diffstat (limited to 'routes/repo/setting.go')
| -rw-r--r-- | routes/repo/setting.go | 1 |
1 files changed, 1 insertions, 0 deletions
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 { |