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

Merge branch 'feature/new-branches-ui' of https://github.com/team-lab/gitbucket into team-lab-feature/new-branches-ui

Browse Source 
Conflicts:
	src/main/scala/service/PullRequestService.scala
This commit is contained in:
Naoki Takezoe
2015-02-27 02:05:02 +09:00
parent e67365a19f a417c373f1
commit 20217058fe
6 changed files with 189 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,14 +322,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
* Displays branches.
*/
get("/:owner/:repository/branches")(referrersOnly { repository =>
using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
// retrieve latest update date of each branch
val branchInfo = repository.branchList.map { branchName =>
val revCommit = git.log.add(git.getRepository.resolve(branchName)).setMaxCount(1).call.iterator.next
(branchName, revCommit.getCommitterIdent.getWhen)
}
repo.html.branches(branchInfo, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
}
val branches = JGitUtil.getBranches(repository.owner, repository.name, repository.repository.defaultBranch)
.sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
.map(br => br -> getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId))
.reverse
repo.html.branches(branches, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
})
/**