Fix merge conflict in migrations.go, v238.go, create v999.go and Merge remote-tracking branch 'upstream/main' into limit-repo-size

2026-07-26 02:58:42 +02:00 · 2023-01-17 09:58:29 +00:00
parent c20faeff10 9edf80f472
commit 3429b994d8
67 changed files with 1668 additions and 964 deletions
@@ -188,7 +188,7 @@ func (f *RepoSettingForm) Validate(req *http.Request, errs binding.Errors) bindi

 // ProtectBranchForm form for changing protected branch settings
 type ProtectBranchForm struct {
-	Protected                     bool
+	RuleName                      string `binding:"Required"`
 	EnablePush                    string
 	WhitelistUsers                string
 	WhitelistTeams                string