diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2017-06-08 12:20:37 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-08 12:20:37 +0000 |
| commit | 7078dfcc095fd70713fe87305d4599953df5a41d (patch) | |
| tree | ac36b0b8a1db63de37eb47a37a92a27d83df6980 | |
| parent | 7bf450d973351dd58b58815097abc40ed78dc1c1 (diff) | |
| parent | 03742e2908996567d8bc4e5f40cdb807c9f59726 (diff) | |
| download | gitlab-ce-7078dfcc095fd70713fe87305d4599953df5a41d.tar.gz | |
Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11793' into 9-2-stable
| -rw-r--r-- | app/assets/javascripts/blob/viewer/index.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js index d06387c0f4d..3eddf595f30 100644 --- a/app/assets/javascripts/blob/viewer/index.js +++ b/app/assets/javascripts/blob/viewer/index.js @@ -78,7 +78,7 @@ export default class BlobViewer { .fail(() => new Flash('Error loading source view')) .done((data) => { viewer.innerHTML = data.html; - $(viewer).syntaxHighlight(); + $(viewer).renderGFM(); viewer.setAttribute('data-loaded', 'true'); diff --git a/changelogs/unreleased/33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations.yml b/changelogs/unreleased/33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations.yml new file mode 100644 index 00000000000..5648e013e75 --- /dev/null +++ b/changelogs/unreleased/33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations.yml @@ -0,0 +1,4 @@ +--- +title: Fix math rendering on blob pages +merge_request: +author: |