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-08-17 12:11:44 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-17 12:11:44 +0300
commite750680e89a6f98803709c172943962741eeb9e7 (patch)
treed3e28a3692460fb37c4891d646220d06e68dfa3d /lib/gitlab/diff
parenta17e8b168778e5a107928671fd2829ab284e612d (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/diff')
-rw-r--r--lib/gitlab/diff/rendered/notebook/diff_file.rb2
-rw-r--r--lib/gitlab/diff/rendered/notebook/diff_file_helper.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/diff/rendered/notebook/diff_file.rb b/lib/gitlab/diff/rendered/notebook/diff_file.rb
index 3e1652bd318..31cbdc156cf 100644
--- a/lib/gitlab/diff/rendered/notebook/diff_file.rb
+++ b/lib/gitlab/diff/rendered/notebook/diff_file.rb
@@ -56,7 +56,7 @@ module Gitlab
)
lines.zip(line_positions_at_source_diff(lines, transformed_blocks))
- .map { |line, positions| mutate_line(line, positions, lines_in_source)}
+ .map { |line, positions| mutate_line(line, positions, lines_in_source) }
end
end
diff --git a/lib/gitlab/diff/rendered/notebook/diff_file_helper.rb b/lib/gitlab/diff/rendered/notebook/diff_file_helper.rb
index f381792953e..ad709a79f30 100644
--- a/lib/gitlab/diff/rendered/notebook/diff_file_helper.rb
+++ b/lib/gitlab/diff/rendered/notebook/diff_file_helper.rb
@@ -77,8 +77,8 @@ module Gitlab
def lines_in_source_diff(source_diff_lines, is_deleted_file, is_added_file)
{
- from: is_added_file ? Set[] : source_diff_lines.map {|l| l.old_pos}.to_set,
- to: is_deleted_file ? Set[] : source_diff_lines.map {|l| l.new_pos}.to_set
+ from: is_added_file ? Set[] : source_diff_lines.map { |l| l.old_pos }.to_set,
+ to: is_deleted_file ? Set[] : source_diff_lines.map { |l| l.new_pos }.to_set
}
end