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>2021-11-11 15:10:41 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-11 15:10:41 +0300
commit1c7411c597334e20d2e92cc948f0699d339d2710 (patch)
treee88e76f1f563b71a4b9113373f24849bc5d1d79e /lib/gitlab/diff
parent3e9023894d319cf56b7b844910953df19ca010b1 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/diff')
-rw-r--r--lib/gitlab/diff/position_tracer/line_strategy.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/diff/position_tracer/line_strategy.rb b/lib/gitlab/diff/position_tracer/line_strategy.rb
index 8bacc781f61..0f0b8f0c4f3 100644
--- a/lib/gitlab/diff/position_tracer/line_strategy.rb
+++ b/lib/gitlab/diff/position_tracer/line_strategy.rb
@@ -104,7 +104,7 @@ module Gitlab
# the current state on the CD diff, so we treat it as outdated.
ac_diff = ac_diffs.diff_file_with_new_path(c_path, c_mode)
- { position: new_position(ac_diff, nil, c_line), outdated: true }
+ { position: new_position(ac_diff, nil, c_line, position.line_range), outdated: true }
end
else
# If the line is still in D and not in C, it is still added.
@@ -112,7 +112,7 @@ module Gitlab
end
else
# If the line is no longer in D, it has been removed from the MR.
- { position: new_position(bd_diff, b_line, nil), outdated: true }
+ { position: new_position(bd_diff, b_line, nil, position.line_range), outdated: true }
end
end
@@ -140,14 +140,14 @@ module Gitlab
# removed line into an unchanged one.
bd_diff = bd_diffs.diff_file_with_new_path(d_path, d_mode)
- { position: new_position(bd_diff, nil, d_line), outdated: true }
+ { position: new_position(bd_diff, nil, d_line, position.line_range), outdated: true }
else
# If the line is still in C and not in D, it is still removed.
{ position: new_position(cd_diff, c_line, nil, position.line_range), outdated: false }
end
else
# If the line is no longer in C, it has been removed outside of the MR.
- { position: new_position(ac_diff, a_line, nil), outdated: true }
+ { position: new_position(ac_diff, a_line, nil, position.line_range), outdated: true }
end
end