Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-03-24 21:07:52 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-03-24 21:07:52 +0300
commit80c12cd5b2d42f4be0b1a9b550f0441157de7144 (patch)
treee84398f1721ff4e1a2855b346182a8b869ed1a44 /lib/gitlab/blame.rb
parent7173270eb496d0bec6759a22c4af7a4f37ca8dd7 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/blame.rb')
-rw-r--r--lib/gitlab/blame.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/blame.rb b/lib/gitlab/blame.rb
index 78a8f39e143..9d3903ac839 100644
--- a/lib/gitlab/blame.rb
+++ b/lib/gitlab/blame.rb
@@ -15,13 +15,13 @@ module Gitlab
current_group = nil
i = 0
- blame.each do |commit, line|
+ blame.each do |commit, line, previous_path|
commit = Commit.new(commit, project)
commit.lazy_author # preload author
if prev_sha != commit.sha
groups << current_group if current_group
- current_group = { commit: commit, lines: [] }
+ current_group = { commit: commit, lines: [], previous_path: previous_path }
end
current_group[:lines] << (highlight ? highlighted_lines[i].html_safe : line)