Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2026-07-13 01:11:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

repo/pull: allow rebase before merging (#4805)

Browse Source
This commit is contained in:
Unknwon
2017-11-15 23:27:52 -05:00
parent 5cd1fdeb9e
commit 34c2e52bd5
9 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/bindata/bindata.go
View File

File diff suppressed because one or more lines are too long

2
pkg/form/repo.go
View File

@@ -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 {