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

(refs #341) Fix compile errors.

Browse Source
This commit is contained in:
shimamoto
2014-07-01 04:08:15 +09:00
parent c361d24ba4
commit 259bcfc14f
10 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/app/AccountController.scala
View File

@@ -5,6 +5,7 @@ import util._
import util.StringUtil._
import util.Directory._
import util.ControlUtil._
import util.Implicits._
import ssh.SshUtil
import jp.sf.amateras.scalatra.forms._
import org.apache.commons.io.FileUtils

7
src/main/scala/app/ControllerBase.scala
View File

@@ -9,8 +9,7 @@ import org.scalatra.json._
import org.json4s._
import jp.sf.amateras.scalatra.forms._
import org.apache.commons.io.FileUtils
import slick.jdbc.JdbcBackend
import model.Account
import model._
import service.{SystemSettingsService, AccountService}
import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
import javax.servlet.{FilterChain, ServletResponse, ServletRequest}
@@ -25,10 +24,6 @@ abstract class ControllerBase extends ScalatraFilter
implicit val jsonFormats = DefaultFormats
// Convert to slick session.
implicit def request2Session(implicit request: HttpServletRequest): JdbcBackend#Session =
request.getAttribute(Keys.Request.DBSession).asInstanceOf[JdbcBackend#Session]
// Don't set content type via Accept header.
override def format(implicit request: HttpServletRequest) = ""

1
src/main/scala/app/IndexController.scala
View File

@@ -1,6 +1,7 @@
package app
import util._
import util.Implicits._
import service._
import jp.sf.amateras.scalatra.forms._

1
src/main/scala/app/LabelsController.scala
View File

@@ -3,6 +3,7 @@ package app
import jp.sf.amateras.scalatra.forms._
import service._
import util.CollaboratorsAuthenticator
import util.Implicits._
import org.scalatra.i18n.Messages
class LabelsController extends LabelsControllerBase

5
src/main/scala/app/RepositorySettingsController.scala
View File

@@ -2,13 +2,14 @@ package app
import service._
import util.Directory._
import util.ControlUtil._
import util.Implicits._
import util.{UsersAuthenticator, OwnerAuthenticator}
import util.JGitUtil.CommitInfo
import jp.sf.amateras.scalatra.forms._
import org.apache.commons.io.FileUtils
import org.scalatra.i18n.Messages
import service.WebHookService.WebHookPayload
import util.JGitUtil.CommitInfo
import util.ControlUtil._
import org.eclipse.jgit.api.Git
class RepositorySettingsController extends RepositorySettingsControllerBase

3
src/main/scala/app/UserManagementController.scala
View File

@@ -4,10 +4,11 @@ import service._
import util.AdminAuthenticator
import util.StringUtil._
import util.ControlUtil._
import util.Directory._
import util.Implicits._
import jp.sf.amateras.scalatra.forms._
import org.scalatra.i18n.Messages
import org.apache.commons.io.FileUtils
import util.Directory._
class UserManagementController extends UserManagementControllerBase
with AccountService with RepositoryService with AdminAuthenticator

2
src/main/scala/app/WikiController.scala
View File

@@ -4,10 +4,10 @@ import service._
import util._
import util.Directory._
import util.ControlUtil._
import util.Implicits._
import jp.sf.amateras.scalatra.forms._
import org.eclipse.jgit.api.Git
import org.scalatra.i18n.Messages
import scala.Some
import java.util.ResourceBundle
class WikiController extends WikiControllerBase