Compare commits

...

2 Commits

Author SHA1 Message Date
Naoki Takezoe
014bdb9d5c Bump to 4.12.1 2017-05-04 10:29:48 +09:00
Damian Bronecki
bef65870d8 Fix redirect issue by partially reverting to 956af54 - fixes #1567 2017-05-04 10:28:52 +09:00
3 changed files with 10 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
val Organization = "io.github.gitbucket"
val Name = "gitbucket"
val GitBucketVersion = "4.12.0"
val GitBucketVersion = "4.12.1"
val ScalatraVersion = "2.5.0"
val JettyVersion = "9.3.9.v20160517"

View File

@@ -32,5 +32,6 @@ object GitBucketCoreModule extends Module("gitbucket-core",
new Version("4.11.0",
new LiquibaseMigration("update/gitbucket-core_4.11.xml")
),
new Version("4.12.0")
new Version("4.12.0"),
new Version("4.12.1")
)

View File

@@ -147,6 +147,13 @@ abstract class ControllerBase extends ScalatraFilter
}
}
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.
*/