diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
commit | db384e6b19af03b4c3c82a5760d83a3fd79f7982 (patch) | |
tree | 34beaef37df5f47ccbcf5729d7583aae093cffa0 /lib/gitlab/blame.rb | |
parent | 54fd7b1bad233e3944434da91d257fa7f63c3996 (diff) |
Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42
Diffstat (limited to 'lib/gitlab/blame.rb')
-rw-r--r-- | lib/gitlab/blame.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/blame.rb b/lib/gitlab/blame.rb index e210c18e3d1..ac39daf375f 100644 --- a/lib/gitlab/blame.rb +++ b/lib/gitlab/blame.rb @@ -20,13 +20,13 @@ module Gitlab current_group = nil i = first_line - 1 - blame.each do |commit, line, previous_path| + blame.each do |commit, line, previous_path, span| 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: [], previous_path: previous_path } + current_group = { commit: commit, lines: [], previous_path: previous_path, span: span, lineno: i + 1 } end current_group[:lines] << (highlight ? highlighted_lines[i].html_safe : line) |