summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-24 09:38:44 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-24 09:38:44 +0300
commit728bdfc50451b2d5a4135110131e70d942a299e1 (patch)
treec74c461e6aeeb480953a488d55e88577e487ef67 /app/assets
parent1feaa336edf7a16ca39b036345890f05d35a1463 (diff)
parent4134b38a8487bf28ac0a79f073e8136eabf7708c (diff)
downloadgitlab-ce-728bdfc50451b2d5a4135110131e70d942a299e1.tar.gz
Merge pull request #6843 from evanlucas/bug/6546
Fix syntax highlighting
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/dispatcher.js.coffee4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 46d6db0f05c..b61d9875e03 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -59,7 +59,7 @@ class Dispatcher
initHighlight: ->
$('.highlight pre code').each (i, e) ->
- hljs.highlightBlock(e)
$(e).html($.map($(e).html().split("\n"), (line, i) ->
- "<div class='line' id='LC" + (i + 1) + "'>" + line + "</div>"
+ "<span class='line' id='LC" + (i + 1) + "'>" + line + "</span>"
).join("\n"))
+ hljs.highlightBlock(e)