summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-24 19:41:34 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-24 19:41:34 +0200
commitd89f26e0112a8bb4a3e75c51d08a3c22dbfe1753 (patch)
tree877bd3588ca9a8498d087a409139c4b670736b52
parent2a99f18478797c67e0b795d71688bd06153abe5a (diff)
parent728bdfc50451b2d5a4135110131e70d942a299e1 (diff)
downloadgitlab-ce-d89f26e0112a8bb4a3e75c51d08a3c22dbfe1753.tar.gz
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
-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)