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

(refs #341)Fix compilation error of delete statements

Browse Source
This commit is contained in:
Naoki Takezoe
2014-07-06 15:42:45 +09:00
parent 606cd83f44
commit cce0b67871
13 changed files with 480 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/model/package.scala
View File

@@ -1,6 +1,7 @@
package object model extends { package object model extends {
// TODO // TODO
val profile = slick.driver.H2Driver val profile = slick.driver.H2Driver
val simple = profile.simple
} with AccountComponent } with AccountComponent
with ActivityComponent with ActivityComponent

2
src/main/scala/service/AccountService.scala
View File

@@ -1,7 +1,7 @@
package service package service
import model._ import model._
import profile.simple._ import simple._
import service.SystemSettingsService.SystemSettings import service.SystemSettingsService.SystemSettings
import util.StringUtil._ import util.StringUtil._
import util.LDAPUtil import util.LDAPUtil

2
src/main/scala/service/ActivityService.scala
View File

@@ -1,7 +1,7 @@
package service package service
import model._ import model._
import profile.simple._ import simple._
trait ActivityService { trait ActivityService {

2
src/main/scala/service/IssuesService.scala
View File

@@ -4,7 +4,7 @@ import scala.slick.jdbc.{StaticQuery => Q}
import Q.interpolation import Q.interpolation
import model._ import model._
import profile.simple._ import simple._
import util.Implicits._ import util.Implicits._
import util.StringUtil._ import util.StringUtil._

2
src/main/scala/service/LabelsService.scala
View File

@@ -1,7 +1,7 @@
package service package service
import model._ import model._
import profile.simple._ import simple._
trait LabelsService { trait LabelsService {

2
src/main/scala/service/MilestonesService.scala
View File

@@ -1,7 +1,7 @@
package service package service
import model._ import model._
import profile.simple._ import simple._
trait MilestonesService { trait MilestonesService {

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

@@ -1,7 +1,7 @@
package service package service
import model._ import model._
import profile.simple._ import simple._
trait PullRequestService { self: IssuesService => trait PullRequestService { self: IssuesService =>
import PullRequestService._ import PullRequestService._

4
src/main/scala/service/RepositorySearchService.scala
View File

@@ -3,12 +3,12 @@ package service
import util.{FileUtil, StringUtil, JGitUtil} import util.{FileUtil, StringUtil, JGitUtil}
import util.Directory._ import util.Directory._
import util.ControlUtil._ import util.ControlUtil._
import model.Issue
import org.eclipse.jgit.revwalk.RevWalk import org.eclipse.jgit.revwalk.RevWalk
import org.eclipse.jgit.treewalk.TreeWalk import org.eclipse.jgit.treewalk.TreeWalk
import org.eclipse.jgit.lib.FileMode import org.eclipse.jgit.lib.FileMode
import org.eclipse.jgit.api.Git import org.eclipse.jgit.api.Git
import model.profile.simple.Session import model._
import simple._
trait RepositorySearchService { self: IssuesService => trait RepositorySearchService { self: IssuesService =>
import RepositorySearchService._ import RepositorySearchService._

2
src/main/scala/service/RepositoryService.scala
View File

@@ -1,7 +1,7 @@
package service package service
import model._ import model._
import profile.simple._ import simple._
import util.JGitUtil import util.JGitUtil
trait RepositoryService { self: AccountService => trait RepositoryService { self: AccountService =>

2
src/main/scala/service/SshKeyService.scala
View File

@@ -1,7 +1,7 @@
package service package service
import model._ import model._
import profile.simple._ import simple._
trait SshKeyService { trait SshKeyService {

2
src/main/scala/service/WebHookService.scala
View File

@@ -1,7 +1,7 @@
package service package service
import model._ import model._
import profile.simple._ import simple._
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import service.RepositoryService.RepositoryInfo import service.RepositoryService.RepositoryInfo
import util.JGitUtil import util.JGitUtil

8
src/main/scala/service/WikiService.scala
View File

@@ -2,22 +2,18 @@ package service
import java.util.Date import java.util.Date
import org.eclipse.jgit.api.Git import org.eclipse.jgit.api.Git
import org.apache.commons.io.FileUtils
import util._ import util._
import _root_.util.ControlUtil._ import _root_.util.ControlUtil._
import org.eclipse.jgit.treewalk.{TreeWalk, CanonicalTreeParser} import org.eclipse.jgit.treewalk.CanonicalTreeParser
import org.eclipse.jgit.lib._ import org.eclipse.jgit.lib._
import org.eclipse.jgit.dircache.{DirCache, DirCacheEntry} import org.eclipse.jgit.dircache.DirCache
import org.eclipse.jgit.revwalk.RevWalk
import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter} import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter}
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream
import org.eclipse.jgit.patch._ import org.eclipse.jgit.patch._
import org.eclipse.jgit.api.errors.PatchFormatException import org.eclipse.jgit.api.errors.PatchFormatException
import scala.collection.JavaConverters._ import scala.collection.JavaConverters._
import scala.Some
import service.RepositoryService.RepositoryInfo import service.RepositoryService.RepositoryInfo
object WikiService { object WikiService {
/** /**