index
:
gogs.git
Gogs is a painless self-hosted Git service
log msg
author
committer
range
buildscript
main
mygogs
about
summary
refs
log
tree
commit
diff
path:
root
/
pkg
/
form
/
repo.go
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
space:
include
ignore
mode:
unified
ssdiff
stat only
author
Unknwon <u@gogs.io>
2017-11-15 23:27:52 -0500
committer
Unknwon <u@gogs.io>
2017-11-15 23:28:31 -0500
commit
34c2e52bd5523a2c6bafd5026817c8d51387f370
(
patch
)
tree
289fd3ca1b3ee7aafe49915cc57032ddea856591
/
pkg/form/repo.go
parent
5cd1fdeb9ee1af1179a859dc5ed65561bfe5a6d6
(
diff
)
repo/pull: allow rebase before merging (#4805)
Diffstat
(limited to 'pkg/form/repo.go')
-rw-r--r--
pkg/form/repo.go
2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/form/repo.go b/pkg/form/repo.go
index 483076ce..32c5effc 100644
--- a/
pkg/form/repo.go
+++ b/
pkg/form/repo.go
@@ -102,7 +102,7 @@ type RepoSetting struct {
TrackerURLFormat string
TrackerIssueStyle string
EnablePulls bool
- PullUseRebase bool
+ PullsAllowRebase bool
}
func (f *RepoSetting) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {