diff --git a/cmd/web.go b/cmd/web.go index 5bfbdb4495..072d31917a 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -470,7 +470,7 @@ func runWeb(ctx *cli.Context) { m.Post("/delete", repo.DeleteRelease) }, reqRepoAdmin, middleware.RepoRef()) - m.Combo("/compare/*", repo.MustEnablePulls).Get(repo.CompareAndPullRequest). + m.Combo("/compare/*", repo.MustAllowPulls).Get(repo.CompareAndPullRequest). Post(bindIgnErr(auth.CreateIssueForm{}), repo.CompareAndPullRequestPost) }, reqSignIn, middleware.RepoAssignment(), repo.MustBeNotBare) @@ -503,7 +503,7 @@ func runWeb(ctx *cli.Context) { m.Get("/commits", middleware.RepoRef(), repo.ViewPullCommits) m.Get("/files", middleware.RepoRef(), repo.ViewPullFiles) m.Post("/merge", reqRepoAdmin, repo.MergePullRequest) - }, repo.MustEnablePulls) + }, repo.MustAllowPulls) m.Group("", func() { m.Get("/src/*", repo.Home) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 76822eb05e..400da72029 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -47,11 +47,9 @@ func MustEnableIssues(ctx *middleware.Context) { } } -func MustEnablePulls(ctx *middleware.Context) { - if !ctx.Repo.Repository.CanEnablePulls() { - ctx.Handle(404, "Unsupported", nil) - } else if !ctx.Repo.Repository.EnablePulls { - ctx.Handle(404, "MustEnablePulls", nil) +func MustAllowPulls(ctx *middleware.Context) { + if !ctx.Repo.Repository.AllowsPulls() { + ctx.Handle(404, "MustAllowPulls", nil) } ctx.Data["HasForkedRepo"] = ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID) @@ -73,7 +71,7 @@ func RetrieveLabels(ctx *middleware.Context) { func Issues(ctx *middleware.Context) { isPullList := ctx.Params(":type") == "pulls" if isPullList { - MustEnablePulls(ctx) + MustAllowPulls(ctx) if ctx.Written() { return }