Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow set branch protection in an empty repository (#32095) (#32119) 

Backport #32095 by @lunny

Resolve #32093

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Giteabot 2024-09-24 10:42:52 +08:00 committed by GitHub
parent a3c660f89a
commit 0f834f052b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
routers/web/web.go
View File

@ -1063,7 +1063,7 @@ func registerRoutes(m *web.Route) {
m.Combo("/edit").Get(repo_setting.SettingsProtectedBranch). m.Combo("/edit").Get(repo_setting.SettingsProtectedBranch).
Post(web.Bind(forms.ProtectBranchForm{}), context.RepoMustNotBeArchived(), repo_setting.SettingsProtectedBranchPost) Post(web.Bind(forms.ProtectBranchForm{}), context.RepoMustNotBeArchived(), repo_setting.SettingsProtectedBranchPost)
m.Post("/{id}/delete", repo_setting.DeleteProtectedBranchRulePost) m.Post("/{id}/delete", repo_setting.DeleteProtectedBranchRulePost)
}, repo.MustBeNotEmpty) })
m.Group("/tags", func() { m.Group("/tags", func() {
m.Get("", repo_setting.ProtectedTags) m.Get("", repo_setting.ProtectedTags)

22
templates/repo/settings/branches.tmpl
View File

@ -15,19 +15,17 @@
<form class="tw-flex" action="{{.Link}}" method="post"> <form class="tw-flex" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input type="hidden" name="action" value="default_branch"> <input type="hidden" name="action" value="default_branch">
{{if not .Repository.IsEmpty}} <div class="ui dropdown selection search tw-flex-1 tw-mr-2 tw-max-w-96">
<div class="ui dropdown selection search tw-flex-1 tw-mr-2 tw-max-w-96"> {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}} <input type="hidden" name="branch" value="{{.Repository.DefaultBranch}}">
<input type="hidden" name="branch" value="{{.Repository.DefaultBranch}}"> <div class="default text">{{.Repository.DefaultBranch}}</div>
<div class="default text">{{.Repository.DefaultBranch}}</div> <div class="menu">
<div class="menu"> {{range .Branches}}
{{range .Branches}} <div class="item" data-value="{{.}}">{{.}}</div>
<div class="item" data-value="{{.}}">{{.}}</div> {{end}}
{{end}}
</div>
</div> </div>
<button class="ui primary button">{{ctx.Locale.Tr "repo.settings.branches.update_default_branch"}}</button> </div>
{{end}} <button class="ui primary button"{{if .Repository.IsEmpty}} disabled{{end}}>{{ctx.Locale.Tr "repo.settings.branches.update_default_branch"}}</button>
</form> </form>
</div> </div>

8
templates/repo/settings/navbar.tmpl
View File

@ -13,11 +13,9 @@
</a> </a>
{{end}} {{end}}
{{if .Repository.UnitEnabled $.Context ctx.Consts.RepoUnitTypeCode}} {{if .Repository.UnitEnabled $.Context ctx.Consts.RepoUnitTypeCode}}
{{if not .Repository.IsEmpty}} <a class="{{if .PageIsSettingsBranches}}active {{end}}item" href="{{.RepoLink}}/settings/branches">
<a class="{{if .PageIsSettingsBranches}}active {{end}}item" href="{{.RepoLink}}/settings/branches"> {{ctx.Locale.Tr "repo.settings.branches"}}
{{ctx.Locale.Tr "repo.settings.branches"}} </a>
</a>
{{end}}
<a class="{{if .PageIsSettingsTags}}active {{end}}item" href="{{.RepoLink}}/settings/tags"> <a class="{{if .PageIsSettingsTags}}active {{end}}item" href="{{.RepoLink}}/settings/tags">
{{ctx.Locale.Tr "repo.settings.tags"}} {{ctx.Locale.Tr "repo.settings.tags"}}
</a> </a>