diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-12 00:36:38 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-02-12 00:36:38 +0000 |
| commit | 67fefe0ed93b4c5b78c09d50020e6c8c593335be (patch) | |
| tree | eb9a0206e66c396620ce4af45b2434a325053380 | |
| parent | 07faf8144a63ad6effe63eac6cc0d02a1d67d6c3 (diff) | |
| parent | 5a5ee6188ba2960b80d0e00fa5404ebb55135698 (diff) | |
| download | gitlab-ce-67fefe0ed93b4c5b78c09d50020e6c8c593335be.tar.gz | |
Merge branch 'issue_13365' into 'master'
Load all blob data when highlighting content for git-blame.
Fixes #13365
See merge request !2792
| -rw-r--r-- | lib/gitlab/blame.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/blame.rb b/lib/gitlab/blame.rb index 313e6b9fc03..997a22779a0 100644 --- 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 |