Commit 5bdcdf56 authored by Valery Sizov's avatar Valery Sizov

Fast blame

parent ce30eb2b
......@@ -7,7 +7,7 @@ class Projects::BlameController < Projects::ApplicationController
before_action :authorize_download_code!
def show
@blob = @repository.blob_at(@commit.id, @path)
@blame = Gitlab::Git::Blame.new(@repository, @commit.id, @path)
@blob = @blame.blob
end
end
......@@ -12,25 +12,26 @@
= render "projects/blob/actions"
.file-content.blame.highlight
%table
- @blame.each do |commit, lines, since|
- commit = Commit.new(commit, @project)
- current_line = 1
- @blame.each do |raw_commit, line|
%tr
%td.blame-commit
%span.commit
- unless @prev_commit && @prev_commit.sha == raw_commit.sha
- commit = Commit.new(raw_commit, @project)
= link_to commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit), class: "commit_short_id"
&nbsp;
= commit_author_link(commit, avatar: true, size: 16)
&nbsp;
= link_to_gfm truncate(commit.title, length: 20), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "row_title"
- @prev_commit = raw_commit
%td.lines.blame-numbers
%pre
- (since...(since + lines.count)).each do |i|
= i
\
= current_line
- current_line += 1
%td.lines
%pre{class: 'code highlight white'}
%code
:erb
<% lines.each do |line| %>
<%= highlight(@blob.name, line, nowrap: true, continue: true).html_safe %>
<% end %>
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment