From 3795de97a4cc6110fad4f54f3204785e1118f85b Mon Sep 17 00:00:00 2001 From: Damian Bronecki Date: Mon, 1 May 2017 22:18:12 +0200 Subject: [PATCH 1/4] Fix redirect issue by partially reverting to 956af54 - fixes #1567 --- .../scala/gitbucket/core/controller/ControllerBase.scala | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala index de80f9774..d79d86d1d 100644 --- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala +++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala @@ -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. */ From 6ffb2dbad749b260c68f1e19a644d2be7932e723 Mon Sep 17 00:00:00 2001 From: t-tsutsumi Date: Tue, 2 May 2017 20:23:34 +0900 Subject: [PATCH 2/4] Fix incorrect initial height of textarea --- src/main/twirl/gitbucket/core/helper/preview.scala.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/twirl/gitbucket/core/helper/preview.scala.html b/src/main/twirl/gitbucket/core/helper/preview.scala.html index 473dcd2d2..4ec4b0913 100644 --- a/src/main/twirl/gitbucket/core/helper/preview.scala.html +++ b/src/main/twirl/gitbucket/core/helper/preview.scala.html @@ -44,6 +44,7 @@ $(function(){ @if(elastic){ $('#content@uid').elastic(); + $('#content@uid').trigger('blur'); } $('#preview@uid').click(function(){ From 5f9fd23c479200f1d2f000039bed070797b28885 Mon Sep 17 00:00:00 2001 From: t-tsutsumi Date: Thu, 4 May 2017 04:11:04 +0900 Subject: [PATCH 3/4] Remove SLF4J JDK14 binding --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 54a056f03..1dcfb9365 100644 --- a/build.sbt +++ b/build.sbt @@ -33,7 +33,7 @@ libraryDependencies ++= Seq( "org.apache.commons" % "commons-compress" % "1.11", "org.apache.commons" % "commons-email" % "1.4", "org.apache.httpcomponents" % "httpclient" % "4.5.1", - "org.apache.sshd" % "apache-sshd" % "1.2.0", + "org.apache.sshd" % "apache-sshd" % "1.2.0" exclude("org.slf4j","slf4j-jdk14"), "org.apache.tika" % "tika-core" % "1.13", "com.github.takezoe" %% "blocking-slick-32" % "0.0.8", "joda-time" % "joda-time" % "2.9.6", From 9faa3e840255b41c7909a1064022af6b6d8cb021 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Thu, 4 May 2017 10:29:48 +0900 Subject: [PATCH 4/4] Bump to 4.12.1 --- build.sbt | 2 +- src/main/scala/gitbucket/core/GitBucketCoreModule.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 1dcfb9365..c1d678e5e 100644 --- a/build.sbt +++ b/build.sbt @@ -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" diff --git a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala index b33a90941..46fef2ee3 100644 --- a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala +++ b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala @@ -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") )