aboutsummaryrefslogtreecommitdiff
path: root/routers/repo/branch.go
diff options
context:
space:
mode:
Diffstat (limited to 'routers/repo/branch.go')
-rw-r--r--routers/repo/branch.go13
1 files changed, 4 insertions, 9 deletions
diff --git a/routers/repo/branch.go b/routers/repo/branch.go
index aed77cfa..ffd118ae 100644
--- a/routers/repo/branch.go
+++ b/routers/repo/branch.go
@@ -5,27 +5,22 @@
package repo
import (
- "github.com/codegangsta/martini"
+ "github.com/go-martini/martini"
+
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/middleware"
)
func Branches(ctx *middleware.Context, params martini.Params) {
- if !ctx.Repo.IsValid {
- return
- }
-
- brs, err := models.GetBranches(params["username"], params["reponame"])
+ brs, err := models.GetBranches(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
if err != nil {
- ctx.Handle(200, "repo.Branches", err)
+ ctx.Handle(404, "repo.Branches", err)
return
} else if len(brs) == 0 {
ctx.Handle(404, "repo.Branches", nil)
return
}
- ctx.Data["Username"] = params["username"]
- ctx.Data["Reponame"] = params["reponame"]
ctx.Data["Branches"] = brs
ctx.Data["IsRepoToolbarBranches"] = true