diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala index 08a2941..de80f97 100644 --- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala +++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala @@ -40,10 +40,6 @@ contentType = formats("json") } -// TODO Scala 2.11 -// // Don't set content type via Accept header. -// override def format(implicit request: HttpServletRequest) = "" - override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try { val httpRequest = request.asInstanceOf[HttpServletRequest] val httpResponse = response.asInstanceOf[HttpServletResponse] @@ -151,14 +147,6 @@ } } - // TODO Scala 2.11 - override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty, - includeContextPath: Boolean = true, includeServletPath: Boolean = true, - absolutize: Boolean = true, withSessionId: Boolean = true) - (implicit request: HttpServletRequest, response: HttpServletResponse): String = - if (path.startsWith("http")) path - else baseUrl + super.url(path, params, false, false, false) - /** * Extends scalatra-form's trim rule to eliminate CR and LF. */