summaryrefslogtreecommitdiff
path: root/lib/gitlab/blame.rb
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2016-06-10 15:42:43 -0700
committerhttp://jneen.net/ <jneen@jneen.net>2016-06-27 14:17:49 -0700
commitf8b80f7faedef7515d05abd9a5cc315d98724ae3 (patch)
tree9f0079320c6edbf2ded9221960d2f71e1aca5053 /lib/gitlab/blame.rb
parent0fd4b9d3e2c800e728e17e919fa7369b3322c65b (diff)
downloadgitlab-ce-f8b80f7faedef7515d05abd9a5cc315d98724ae3.tar.gz
add custom highlighting via .gitattributes
paired with @stanhu
Diffstat (limited to 'lib/gitlab/blame.rb')
-rw-r--r--lib/gitlab/blame.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/blame.rb b/lib/gitlab/blame.rb
index 997a22779a0..d62bc50ce78 100644
--- a/lib/gitlab/blame.rb
+++ b/lib/gitlab/blame.rb
@@ -41,7 +41,8 @@ module Gitlab
def highlighted_lines
@blob.load_all_data!(repository)
- @highlighted_lines ||= Gitlab::Highlight.highlight(@blob.name, @blob.data).lines
+ @highlighted_lines ||=
+ Gitlab::Highlight.highlight(@blob.path, @blob.data, repository: repository).lines
end
def project