summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-29 17:38:50 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-29 17:38:50 +0300
commitdae9faf340ae4227f1a956b388ca6ee9aee3f8e2 (patch)
tree4041311a03ced9fe3c9937fc0a29d7b244fda5f0
parent8aca1ff0034c34590828df265a933d45fa7c95a4 (diff)
parent652de6f5912deb828cdd666a8a390b06ddd1abbd (diff)
downloadgitlab-ce-dae9faf340ae4227f1a956b388ca6ee9aee3f8e2.tar.gz
Merge pull request #7519 from jvanbaarsen/enable-blame-highlighting
Enable highlighting for blame
-rw-r--r--app/views/projects/blame/show.html.haml11
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index cdca8b2e634..64bbd495102 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -8,7 +8,7 @@
= @path
%small= number_to_human_size @blob.size
%span.options= render "projects/blob/actions"
- .file-content.blame
+ .file-content.blame.highlight
%table
- current_line = 1
- @blame.each do |commit, lines|
@@ -33,7 +33,8 @@
- current_line += 1
%td.lines
%pre
- :erb
- <% lines.each do |line| %>
- <%= line %>
- <% end %>
+ %code{ class: highlightjs_class(@blob.name) }
+ :erb
+ <% lines.each do |line| %>
+ <%= line %>
+ <% end %>