diff --git a/project/build.scala b/project/build.scala index 2a996a7..c9ff79b 100644 --- a/project/build.scala +++ b/project/build.scala @@ -10,7 +10,7 @@ object MyBuild extends Build { val Organization = "gitbucket" val Name = "gitbucket" - val Version = System.getenv("GITBUCKET_VERSION") + val Version = "3.5.0-SNAPSHOT" val ScalaVersion = "2.11.6" val ScalatraVersion = "2.3.1" @@ -50,7 +50,7 @@ "org.json4s" %% "json4s-jackson" % "3.2.11", "jp.sf.amateras" %% "scalatra-forms" % "0.1.0", "commons-io" % "commons-io" % "2.4", - "org.pegdown" % "pegdown" % "1.4.1", // 1.4.2 has incompatible APi changes + "org.pegdown" % "pegdown" % "1.5.0", "org.apache.commons" % "commons-compress" % "1.9", "org.apache.commons" % "commons-email" % "1.3.3", "org.apache.httpcomponents" % "httpclient" % "4.3.6", diff --git a/src/main/scala/gitbucket/core/view/Markdown.scala b/src/main/scala/gitbucket/core/view/Markdown.scala index 859d29c..3cb387f 100644 --- a/src/main/scala/gitbucket/core/view/Markdown.scala +++ b/src/main/scala/gitbucket/core/view/Markdown.scala @@ -47,10 +47,14 @@ } else s val rootNode = new PegDownProcessor( - Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES | Extensions.HARDWRAPS | Extensions.SUPPRESS_ALL_HTML + Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | + Extensions.TABLES | Extensions.HARDWRAPS | Extensions.SUPPRESS_ALL_HTML | Extensions.STRIKETHROUGH ).parseMarkdown(source.toCharArray) - new GitBucketHtmlSerializer(markdown, repository, enableWikiLink, enableRefsLink, enableAnchor, enableTaskList, hasWritePermission, pages).toHtml(rootNode) + new GitBucketHtmlSerializer( + markdown, repository, enableWikiLink, enableRefsLink, enableAnchor, enableTaskList, + hasWritePermission, pages + ).toHtml(rootNode) } } @@ -118,9 +122,9 @@ Map[String, VerbatimSerializer](VerbatimSerializer.DEFAULT -> new GitBucketVerbatimSerializer).asJava ) with LinkConverter with RequestCache { - override protected def printImageTag(imageNode: SuperNode, url: String): Unit = { - printer.print("") - .print("\"").printEncoded(printChildrenToString(imageNode)).print("\"/") + override protected def printImageTag(rendering: LinkRenderer.Rendering): Unit = { + printer.print("") + .print("\"").printEncoded(rendering.text).print("\"/") } override protected def printLink(rendering: LinkRenderer.Rendering): Unit = {