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

Initial version of protected branches (#776)

Browse Source 
- Able to restrict force push and deletion
- Able to restrict direct push
This commit is contained in:
Unknwon
2017-02-17 15:10:50 -05:00
parent dab768212a
commit 7e09d210ba
26 changed files with 528 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/auth/repo_form.go
View File

@@ -106,6 +106,22 @@ func (f *RepoSettingForm) Validate(ctx *macaron.Context, errs binding.Errors) bi
return validate(errs, ctx.Data, f, ctx.Locale)
}
// __________ .__
// \______ \____________ ____ ____ | |__
// | | _/\_ __ \__ \ / \_/ ___\| | \
// | | \ | | \// __ \| | \ \___| Y \
// |______ / |__| (____ /___| /\___ >___| /
// \/ \/ \/ \/ \/
type ProtectBranchForm struct {
Protected bool
RequirePullRequest bool
}
func (f *ProtectBranchForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
return validate(errs, ctx.Data, f, ctx.Locale)
}
// __ __ ___. .__ .__ __
// / \ / \ ____\_ |__ | |__ | |__ ____ | | __
// \ \/\/ // __ \| __ \| | \| | \ / _ \| |/ /

6
modules/bindata/bindata.go
View File

File diff suppressed because one or more lines are too long

2
modules/context/repo.go
View File

@@ -73,7 +73,7 @@ func (r *Repository) HasAccess() bool {
// CanEnableEditor returns true if repository is editable and user has proper access level.
func (r *Repository) CanEnableEditor() bool {
return r.Repository.CanEnableEditor() && r.IsViewBranch && r.IsWriter()
return r.Repository.CanEnableEditor() && r.IsViewBranch && r.IsWriter() && !r.Repository.IsBranchRequirePullRequest(r.BranchName)
}
// GetEditorconfig returns the .editorconfig definition if found in the