Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 22:15:51 +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

10
src/main/scala/model/PullRequest.scala
View File

@@ -3,11 +3,11 @@ package model
import scala.slick.driver.H2Driver.simple._
object PullRequests extends Table[PullRequest]("PULL_REQUEST") with IssueTemplate {
def branch = column[String]("BRANCH")
def requestUserName = column[String]("REQUEST_USER_NAME")
def requestRepositoryName = column[String]("REQUEST_REPOSITORY_NAME")
def requestCommitId = column[String]("REQUEST_COMMIT_ID")
def originBranch = column[String]("ORIGIN_BRANCH")
def * = userName ~ repositoryName ~ issueId ~ originBranch ~ requestUserName ~ requestRepositoryName ~ requestCommitId <> (PullRequest, PullRequest.unapply _)
def requestBranch = column[String]("REQUEST_BRANCH")
def * = userName ~ repositoryName ~ issueId ~ branch ~ requestUserName ~ requestRepositoryName ~ requestBranch <> (PullRequest, PullRequest.unapply _)
def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
@@ -17,7 +17,7 @@ case class PullRequest(
userName: String,
repositoryName: String,
issueId: Int,
originBranch: String,
branch: String,
requestUserName: String,
requestRepositoryName: String,
requestCommitId: String)
requestBranch: String)