Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 05:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show the default branch in the default.

Browse Source
This commit is contained in:
takezoe
2013-06-06 16:40:54 +09:00
parent 497bc61107
commit ab4cde9301
1 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/app/RepositoryViewerController.scala
View File

@@ -230,8 +230,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
* @return HTML of the file list
*/
private def fileList(owner: String, repository: String, revstr: String = "", path: String = ".") = {
getRepository(owner, repository, servletContext) match {
case None => NotFound()
case Some(repositoryInfo) => {
val revision = if(revstr.isEmpty){
Git.open(getRepositoryDir(owner, repository)).getRepository.getBranch
repositoryInfo.repository.defaultBranch
} else {
revstr
}
@@ -251,7 +254,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
// current branch
revision,
// repository
getRepository(owner, repository, servletContext).get,
repositoryInfo,
// current path
if(path == ".") Nil else path.split("/").toList,
// latest commit
@@ -263,5 +266,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
)
}
}
}
}
}