Merge branch 'template-branch-prot' of github.com:jolheiser/gitea into template-branch-prot

jolheiser · jolheiser · commit dbf9a633f07f · 2021-01-26T22:25:50.000-06:00
diff --git a/models/repo_generate.go b/models/repo_generate.go
@@ -33,7 +33,7 @@ type GenerateRepoOptions struct {
 
 // IsValid checks whether at least one option is chosen for generation
 func (gro GenerateRepoOptions) IsValid() bool {
-	return gro.GitContent || gro.Topics || gro.GitHooks || gro.Webhooks || gro.Avatar || gro.IssueLabels || gro.BranchProtection // or other items as they are added
+	return gro.GitContent || gro.Topics || gro.GitHooks || gro.Webhooks || gro.Avatar || gro.IssueLabels // or other items as they are added
 }
 
 // GiteaTemplate holds information about a .gitea/template file

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ type GenerateRepoOptions struct {`
`33`	`33`
`34`	`34`	`// IsValid checks whether at least one option is chosen for generation`
`35`	`35`	`func (gro GenerateRepoOptions) IsValid() bool {`
`36`		`- return gro.GitContent \|\| gro.Topics \|\| gro.GitHooks \|\| gro.Webhooks \|\| gro.Avatar \|\| gro.IssueLabels \|\| gro.BranchProtection // or other items as they are added`
	`36`	`+ return gro.GitContent \|\| gro.Topics \|\| gro.GitHooks \|\| gro.Webhooks \|\| gro.Avatar \|\| gro.IssueLabels // or other items as they are added`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// GiteaTemplate holds information about a .gitea/template file`