diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-30 13:27:57 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-30 13:27:57 +0000 |
| commit | 83550c02c0b3eea942ec34969d406e953d53b587 (patch) | |
| tree | deefe6eeef84676040dda09898524d7ba590b006 | |
| parent | a8901ce63dd302d008459321bd4a8007c7c8f7c7 (diff) | |
| parent | 6821ad96ca3246b3ce70d03fdbc7de45fb7518c8 (diff) | |
| download | gitlab-ce-83550c02c0b3eea942ec34969d406e953d53b587.tar.gz | |
Merge branch '33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations' into 'master'
Fix math rendering on blob pages
Closes #33048
See merge request !11793
| -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 d7c62889dde..187fab084fd 100644 --- a/app/assets/javascripts/blob/viewer/index.js +++ b/app/assets/javascripts/blob/viewer/index.js @@ -111,7 +111,7 @@ export default class BlobViewer { BlobViewer.loadViewer(newViewer) .then((viewer) => { - $(viewer).syntaxHighlight(); + $(viewer).renderGFM(); this.$fileHolder.trigger('highlight:line'); gl.utils.handleLocationHash(); 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: |