diff options
| author | Justin Nuß <nuss.justin@gmail.com> | 2014-07-26 11:23:58 +0200 |
|---|---|---|
| committer | Justin Nuß <nuss.justin@gmail.com> | 2014-07-26 11:23:58 +0200 |
| commit | 91480f3791f266369c343c539f8eeec245fa969a (patch) | |
| tree | a03ad6062fe4b546367cdb6f9921399458d97441 /routers/repo/branch.go | |
| parent | 835e85b5ce9921ffd4d50b90b706e02685167331 (diff) | |
| parent | 35c75f06a0a4f321021984830d760e67ca0ef8e5 (diff) | |
Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281
Conflicts:
modules/base/tool.go
Diffstat (limited to 'routers/repo/branch.go')
| -rw-r--r-- | routers/repo/branch.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 9bad7289..c340b2bf 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -5,8 +5,6 @@ package repo import ( - "github.com/go-martini/martini" - "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/middleware" ) @@ -15,7 +13,7 @@ const ( BRANCH base.TplName = "repo/branch" ) -func Branches(ctx *middleware.Context, params martini.Params) { +func Branches(ctx *middleware.Context) { ctx.Data["Title"] = "Branches" ctx.Data["IsRepoToolbarBranches"] = true |