Merge branch 'issue_13365' into 'master'

Load all blob data when highlighting content for git-blame. Fixes #13365 See merge request !2792

Merge branch 'issue_13365' into 'master'
67fefe0e · Robert Speicher · 07faf814 · 5a5ee618 · 67fefe0e
Commit 67fefe0e authored Feb 12, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

blame.rb lib/gitlab/blame.rb +1 -0

No files found.
--- a/lib/gitlab/blame.rb
+++ b/lib/gitlab/blame.rb
@@ -40,6 +40,7 @@ module Gitlab
    end

    def highlighted_lines
+      @blob.load_all_data!(repository)
      @highlighted_lines ||= Gitlab::Highlight.highlight(@blob.name, @blob.data).lines
    end