Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 14:35:52 +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

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) = ""