luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-05-31 20:02:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' of github.com:gogits/gogs

Browse source 
Conflicts:
	models/repo.go
	routers/repo/single.go
	templates/repo/single.tmpl
This commit is contained in:
Unknown 2014-03-18 00:19:15 -04:00
commit d886f4df97
4 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
routers/repo/single.go
View file

@ -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
}