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)Add merge pull request form.

Browse Source
This commit is contained in:
takezoe
2013-07-14 12:49:49 +09:00
parent 6fd312f784
commit 2fb9f83227
6 changed files with 298 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,11 +25,11 @@ trait PullRequestsControllerBase extends ControllerBase {
"content" -> trim(label("Content", optional(text()))),
"branch" -> trim(text(required, maxlength(100))),
"requestUserName" -> trim(text(required, maxlength(100))),
"requestCommitId" -> trim(text(required, maxlength(40)))
"requestBranch" -> trim(text(required, maxlength(100)))
)(PullRequestForm.apply)
case class PullRequestForm(title: String, content: Option[String], branch: String,
requestUserName: String, requestCommitId: String)
requestUserName: String, requestBranch: String)
get("/:owner/:repository/pulls")(referrersOnly { repository =>
pulls.html.list(repository)
@@ -128,7 +128,7 @@ trait PullRequestsControllerBase extends ControllerBase {
form.branch,
form.requestUserName,
repository.name,
form.requestCommitId)
form.requestBranch)
recordPullRequestActivity(repository.owner, repository.name, loginUserName, issueId, form.title)
@@ -138,16 +138,14 @@ trait PullRequestsControllerBase extends ControllerBase {
get("/:owner/:repository/pulls/:id")(referrersOnly { repository =>
val owner = repository.owner
val name = repository.name
val issueId = params("id")
val issueId = params("id").toInt
getIssue(owner, name, issueId) map {
issues.html.issue(
_,
getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
pulls.html.pullreq(
issue, pullreq,
getComments(owner, name, issueId.toInt),
getIssueLabels(owner, name, issueId.toInt),
(getCollaborators(owner, name) :+ owner).sorted,
getMilestones(owner, name),
Nil,
hasWritePermission(owner, name, context.loginAccount),
repository)
} getOrElse NotFound