diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-18 00:19:15 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-18 00:19:15 -0400 |
| commit | d886f4df9734ccf69647dfb5564effaca85fed50 (patch) | |
| tree | c93303451785d0bf2977a75216165bd8f57ba37b /routers/repo | |
| parent | e44d9ffd89be84ad0f2ddfe6fc986be8eb8fc032 (diff) | |
| parent | 3ceb008e1f50b89a2e0fda8fac939df92642219c (diff) | |
| download | gitea-d886f4df9734ccf69647dfb5564effaca85fed50.tar.gz gitea-d886f4df9734ccf69647dfb5564effaca85fed50.zip | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
models/repo.go
routers/repo/single.go
templates/repo/single.tmpl
Diffstat (limited to 'routers/repo')
| -rw-r--r-- | routers/repo/single.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/routers/repo/single.go b/routers/repo/single.go index 64ea508b0e..0cc41b1c8f 100644 --- a/routers/repo/single.go +++ b/routers/repo/single.go @@ -69,7 +69,7 @@ func Single(ctx *middleware.Context, params martini.Params) { // Directory and file list. files, err := models.GetReposFiles(params["username"], params["reponame"], - params["branchname"], treename) + params["branchname"], params["commitid"], treename) if err != nil { log.Error("repo.Single(GetReposFiles): %v", err) ctx.Render.Error(404) @@ -90,9 +90,10 @@ func Single(ctx *middleware.Context, params martini.Params) { } // Get latest commit according username and repo name - commit, err := models.GetLastCommit(params["username"], params["reponame"], params["branchname"]) + commit, err := models.GetCommit(params["username"], params["reponame"], + params["branchname"], params["commitid"]) if err != nil { - log.Error("repo.Single(GetLastestCommit): %v", err) + log.Error("repo.Single(GetCommit): %v", err) ctx.Render.Error(404) return } |