aboutsummaryrefslogtreecommitdiff
path: root/pkg/form
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-11-16 22:22:38 -0500
committerUnknwon <u@gogs.io>2017-11-16 22:22:38 -0500
commit3b8b8a2ee35b5ca603f02d5eaeac8c3d7334353d (patch)
tree7c8486a3e82b20df34e1df316643aa32107f87a7 /pkg/form
parent6f04ee879ca25fd798f85a4c701291adae561a1a (diff)
pull_request: able to ignore whitespace when check conflict (#4834)
Diffstat (limited to 'pkg/form')
-rw-r--r--pkg/form/repo.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/form/repo.go b/pkg/form/repo.go
index 32c5effc..a524560f 100644
--- a/pkg/form/repo.go
+++ b/pkg/form/repo.go
@@ -102,6 +102,7 @@ type RepoSetting struct {
TrackerURLFormat string
TrackerIssueStyle string
EnablePulls bool
+ PullsIgnoreWhitespace bool
PullsAllowRebase bool
}