From a1b28fc33c4a685ffe9a07f67fa6786ec27524bb Mon Sep 17 00:00:00 2001
From: Download-Fritz <download-fritz@outlook.com>
Date: Fri, 19 Feb 2016 20:48:32 +0100
Subject: Rename MustEnablePulls() to MustAllowPulls() and simplify the
 contained check to AllowsPulls().

---
 routers/repo/issue.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'routers/repo')

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
 		}
-- 
cgit v1.2.3