Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-10-31 18:46:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #2)Remove unused code.

Browse Source
This commit is contained in:
takezoe
2013-07-16 00:29:30 +09:00
parent aae40a7087
commit e59ae9c6e9
1 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/scala/app/PullRequestsController.scala
View File

@@ -71,49 +71,6 @@ trait PullRequestsControllerBase extends ControllerBase {
} getOrElse NotFound
})
// // TODO display in single page?
// get("/:owner/:repository/pulls/:id/commits")(referrersOnly { repository =>
// val owner = repository.owner
// val name = repository.name
// val issueId = params("id").toInt
//
// getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
// pulls.html.commits(
// issue, pullreq,
// (if(pullreq.mergeStartId.isDefined){
// getCompareInfo(owner, name, pullreq.mergeStartId.get, owner, name, pullreq.mergeEndId.get)._1
// } else {
// getCompareInfo(owner, name, pullreq.branch, pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch)._1
// }),
// hasWritePermission(owner, name, context.loginAccount),
// repository)
// } getOrElse NotFound
// })
// // TODO display in single page?
// get("/:owner/:repository/pulls/:id/files")(referrersOnly { repository =>
// val owner = repository.owner
// val name = repository.name
// val issueId = params("id").toInt
//
// getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
// JGitUtil.withGit(getRepositoryDir(owner, name)){ git =>
// val newId = git.getRepository.resolve(pullreq.requestBranch)
//
// pulls.html.files(
// issue, pullreq,
// (if(pullreq.mergeStartId.isDefined){
// getCompareInfo(owner, name, pullreq.mergeStartId.get, owner, name, pullreq.mergeEndId.get)._2
// } else {
// getCompareInfo(owner, name, pullreq.branch, pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch)._2
// }),
// newId.getName,
// hasWritePermission(owner, name, context.loginAccount),
// repository)
// }
// } getOrElse NotFound
// })
post("/:owner/:repository/pulls/:id/merge", mergeForm)(collaboratorsOnly { (form, repository) =>
val issueId = params("id").toInt