Skip to content

The Unified and Autonomous Development Platform

Fix the issue that commit message body does not break lines

Robin Shen2458ce84c734
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index 88c7ac8b48..aad1727998 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -111,7 +111,7 @@ public class GlobalIssueSetting implements Serializable {
Choice normal = new Choice();
normal.setValue("Normal");
- normal.setColor("#9fc5e8");
+ normal.setColor("#0d87e9");
choices.add(normal);
Choice major = new Choice();
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java b/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
index 93d151c60a..6d06430fa2 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
@@ -29,7 +29,7 @@ import io.onedev.server.util.validation.ProjectNameValidator;
public abstract class ReferenceParser<T extends Referenceable> {
- private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("pre", "code", "a");
+ private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("code", "a");
private final Pattern pattern;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
index df53e5b8a3..03ac262281 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
@@ -36,7 +36,7 @@ public class ReferenceTransformer implements Function<String, String> {
@Override
public String apply(String t) {
- String escaped = HtmlEscape.escapeHtml5(t);
+ String escaped = "<pre>" + HtmlEscape.escapeHtml5(t) + "</pre>";
Document doc = Jsoup.parseBodyFragment(escaped);
new IssueParser() {
@@ -96,7 +96,7 @@ public class ReferenceTransformer implements Function<String, String> {
if (url != null) {
StringBuilder builder = new StringBuilder();
- for (Node node: Jsoup.parseBodyFragment(doc.body().html()).body().childNodes()) {
+ for (Node node: Jsoup.parseBodyFragment(doc.body().html()).body().child(0).childNodes()) {
if (node instanceof TextNode) {
TextNode textNode = (TextNode) node;
builder.append("<a href='" + url + "'>" + textNode.getWholeText() + "</a>");
@@ -106,7 +106,7 @@ public class ReferenceTransformer implements Function<String, String> {
}
return builder.toString();
} else {
- return doc.body().html();
+ return doc.body().child(0).html();
}
}