Commit a3692621 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

line numbers for blame

parent e98d4780
...@@ -80,6 +80,18 @@ ...@@ -80,6 +80,18 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
td.blame-commit {
background: #f9f9f9;
min-width: 350px;
}
td.blame-numbers {
pre {
color: #AAA;
white-space: pre;
}
background: #f1f1f1;
border-left: 1px solid #DDD;
}
} }
} }
......
...@@ -20,16 +20,27 @@ ...@@ -20,16 +20,27 @@
%span.options= render "tree/blob_actions" %span.options= render "tree/blob_actions"
.file_content.blame .file_content.blame
%table %table
- current_line = 1
- @blame.each do |commit, lines| - @blame.each do |commit, lines|
- commit = Commit.new(commit) - commit = CommitDecorator.decorate(Commit.new(commit))
- commit = CommitDecorator.decorate(commit)
%tr %tr
%td.author= commit.author_link avatar: true, size: 16 %td.blame-commit
%td.blame_commit %span.commit
  = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
%code= link_to commit.short_id, project_commit_path(@project, commit)  
= link_to_gfm truncate(commit.title, length: 30), project_commit_path(@project, commit), class: "row_title" rescue "--broken encoding" = commit.author_link avatar: true, size: 16
 
= link_to_gfm truncate(commit.title, length: 20), project_commit_path(@project, commit.id), class: "row_title"
%td.lines.blame-numbers
%pre
- if lines.empty?
= current_line
- current_line += 1
- else
- lines.each do |line|
= current_line
- current_line += 1
%td.lines %td.lines
= preserve do %pre
%pre - lines.each do |line|
= lines.join("\n") = line
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