Commit 0b7377d8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #7820 from skv-headless/move_blame_to_rugged

blame with rugged
parents 79a4da90 a286f920
......@@ -179,7 +179,7 @@ GEM
mime-types (~> 1.19)
gitlab_emoji (0.0.1.1)
emoji (~> 1.0.1)
gitlab_git (6.2.1)
gitlab_git (6.3.0)
activesupport (~> 4.0)
charlock_holmes (~> 0.6)
gitlab-grit (~> 2.6)
......
......@@ -10,8 +10,7 @@
%span.options= render "projects/blob/actions"
.file-content.blame.highlight
%table
- current_line = 1
- @blame.each do |commit, lines|
- @blame.each do |commit, lines, since|
- commit = Commit.new(commit)
%tr
%td.blame-commit
......@@ -23,14 +22,9 @@
= 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
- (since...(since + lines.count)).each do |i|
= i
\
%td.lines
%pre
%code{ class: highlightjs_class(@blob.name) }
......
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