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 /templates/repo/settings/options.tmpl | |
| parent | 6f04ee879ca25fd798f85a4c701291adae561a1a (diff) | |
pull_request: able to ignore whitespace when check conflict (#4834)
Diffstat (limited to 'templates/repo/settings/options.tmpl')
| -rw-r--r-- | templates/repo/settings/options.tmpl | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 313bc7ea..4717a944 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -197,10 +197,18 @@ <label>{{.i18n.Tr "repo.settings.pulls_desc"}}</label> </div> </div> - <div class="ui segment field {{if not .Repository.EnablePulls}}disabled{{end}}" id="pull_box"> - <div class="ui checkbox"> - <input name="pulls_allow_rebase" type="checkbox" {{if .Repository.PullsAllowRebase}}checked{{end}}> - <label>{{.i18n.Tr "repo.settings.pulls.allow_rebase_merge"}}</label> + <div class="ui segment {{if not .Repository.EnablePulls}}disabled{{end}}" id="pull_box"> + <div class="field"> + <div class="ui checkbox"> + <input name="pulls_ignore_whitespace" type="checkbox" {{if .Repository.PullsIgnoreWhitespace}}checked{{end}}> + <label>{{.i18n.Tr "repo.settings.pulls.ignore_whitespace"}}</label> + </div> + </div> + <div class="field"> + <div class="ui checkbox"> + <input name="pulls_allow_rebase" type="checkbox" {{if .Repository.PullsAllowRebase}}checked{{end}}> + <label>{{.i18n.Tr "repo.settings.pulls.allow_rebase_merge"}}</label> + </div> </div> </div> {{end}} |