diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 81eef60..b118f69 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -71,49 +71,6 @@ } 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