summaryrefslogtreecommitdiff
path: root/app/views/projects/blame
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-05-23 23:34:03 -0400
committerStan Hu <stanhu@gmail.com>2015-05-27 14:10:58 -0700
commit0cd73885e6279c2a9a477f59eb76095f4e542858 (patch)
tree351a3bf5667d78aa4027538aa03c4e730d36e649 /app/views/projects/blame
parentb222f211c131f471ceae26cff6977881d2d4b4bb (diff)
downloadgitlab-ce-0cd73885e6279c2a9a477f59eb76095f4e542858.tar.gz
Fix git blame syntax highlighting when different commits break up lines
Closes #1521
Diffstat (limited to 'app/views/projects/blame')
-rw-r--r--app/views/projects/blame/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index 462f5b7afb0..8019c7f4569 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -32,5 +32,5 @@
%code
:erb
<% lines.each do |line| %>
- <%= highlight(@blob.name, line, true).html_safe %>
+ <%= highlight(@blob.name, line, nowrap: true, continue: true).html_safe %>
<% end %>