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

Revert to Rep[U].run

Browse Source
This commit is contained in:
Naoki Takezoe
2016-08-15 00:19:01 +09:00
parent 2b5f74b9f3
commit 34bcc85dcc
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@@ -36,7 +36,7 @@ libraryDependencies ++= Seq(
"org.apache.sshd" % "apache-sshd" % "1.2.0",
"org.apache.tika" % "tika-core" % "1.13",
"com.typesafe.slick" %% "slick" % "3.1.1",
"com.github.takezoe" %% "blocking-slick" % "0.0.2",
"com.github.takezoe" %% "blocking-slick" % "0.0.3-SNAPSHOT",
"com.novell.ldap" % "jldap" % "2009-10-07",
"com.h2database" % "h2" % "1.4.192",
"mysql" % "mysql-connector-java" % "5.1.39",

2
src/main/scala/gitbucket/core/service/AccessTokenService.scala
View File

@@ -31,7 +31,7 @@ trait AccessTokenService {
token = makeAccessTokenString
hash = tokenToHash(token)
//} while (AccessTokens.filter(_.tokenHash === hash.bind).exists.run)
} while (Query(AccessTokens.filter(_.tokenHash === hash.bind).exists).first)
} while (AccessTokens.filter(_.tokenHash === hash.bind).exists.run)
val newToken = AccessToken(
userName = userName,
note = note,

2
src/main/scala/gitbucket/core/service/PullRequestService.scala
View File

@@ -111,7 +111,7 @@ trait PullRequestService { self: IssuesService =>
*/
def updatePullRequests(owner: String, repository: String, branch: String)(implicit s: Session): Unit =
getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq =>
if(Query(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists).first){
if(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run){
//if(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run){
val (commitIdTo, commitIdFrom) = JGitUtil.updatePullRequest(
pullreq.userName, pullreq.repositoryName, pullreq.branch, pullreq.issueId,