diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-09 11:59:32 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-09 12:16:54 -0200 |
| commit | 05f06955bad652fa68901d620c32b30969237c69 (patch) | |
| tree | af779a5bdbb55ce2a6e31db805168b2620d65c0a | |
| parent | 9e5ac7285cc6b9b641d863457086b2e5292699e1 (diff) | |
| download | gitlab-ce-05f06955bad652fa68901d620c32b30969237c69.tar.gz | |
Ensure existing notes are highlighted properly on a merge request diff
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index b0eeb1db536..1f0b6d9ced0 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -144,7 +144,9 @@ class @MergeRequestTabs @_get url: "#{source}.json" + @_location.search success: (data) => - document.getElementById('diffs').innerHTML = data.html + html = $(data.html) + html.syntaxHighlight() + $('#diffs').html(html) @diffsLoaded = true @scrollToElement("#diffs") |