Skip to content

The Unified and Autonomous Development Platform

Add assembly highlight support in markdown and diff

Robin Shen2d165b8d8fd3
diff --git a/pom.xml b/pom.xml
index 1cf70fa5e2..6fac1b0075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -558,8 +558,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.0.24</commons.version>
- <agent.version>1.2.11</agent.version>
+ <commons.version>2.1.0</commons.version>
+ <agent.version>1.2.12</agent.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.0</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js
index 9028d3fe3a..45c33c8585 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js
@@ -55,8 +55,6 @@ onedev.server.codemirror = {
// specify mode via mime does not work for gfm (github flavored markdown)
if (modeInfo.mode === "gfm")
cm.setOption("mode", "gfm");
- else if (modeInfo.mode == "gas")
- cm.setOption("mode", {name: "gas", architecture: "ARMv6"});
else
cm.setOption("mode", modeInfo.mime);
CodeMirror.autoLoadMode(cm, modeInfo.mode);
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/gas/gas.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/gas/gas.js
index 0c74bedc57..1a6a369335 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/gas/gas.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/gas/gas.js
@@ -342,4 +342,6 @@ CodeMirror.defineMode("gas", function(_config, parserConfig) {
};
});
+CodeMirror.defineMIME("text/x-gas", {name: "gas", architecture: "unknown"});
+
});