Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-12-15 17:11:38 +0300
committerSean McGivern <sean@mcgivern.me.uk>2016-12-15 17:11:38 +0300
commit4d1f5837125ffbe363897c8b222536e3e6db8fa5 (patch)
tree231cbd8672324cf0aeae0db291c948adefcfa9fd /app/assets/javascripts/blob_edit
parentecfa8655de37a84007a72c274b5f9662c02499ef (diff)
parent2d170a20dc4cd3423ac7994c797cae8fbed263ba (diff)
Merge branch 'katex-math' into 'master'
Render math in Asciidoc and Markdown with KaTeX using code blocks Closes #13690 and #13180 See merge request !8003
Diffstat (limited to 'app/assets/javascripts/blob_edit')
-rw-r--r--app/assets/javascripts/blob_edit/edit_blob.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/blob_edit/edit_blob.js b/app/assets/javascripts/blob_edit/edit_blob.js
index 33a1ddcaf09..b528e32340d 100644
--- a/app/assets/javascripts/blob_edit/edit_blob.js
+++ b/app/assets/javascripts/blob_edit/edit_blob.js
@@ -60,7 +60,7 @@
content: this.editor.getValue()
}, function(response) {
currentPane.empty().append(response);
- return currentPane.syntaxHighlight();
+ return currentPane.renderGFM();
});
} else {
this.$toggleButton.show();