diff options
Diffstat (limited to 'routers/repo/setting.go')
| -rw-r--r-- | routers/repo/setting.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/routers/repo/setting.go b/routers/repo/setting.go index c52be187..eb139476 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -373,7 +373,15 @@ func SettingsBranches(ctx *context.Context) { ctx.Handle(500, "GetProtectBranchesByRepoID", err) return } - ctx.Data["ProtectBranches"] = protectBranches + + // Filter out deleted branches + branches := make([]string, 0, len(protectBranches)) + for i := range protectBranches { + if ctx.Repo.GitRepo.IsBranchExist(protectBranches[i].Name) { + branches = append(branches, protectBranches[i].Name) + } + } + ctx.Data["ProtectBranches"] = branches ctx.HTML(200, SETTINGS_BRANCHES) } |