summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-10-15 03:12:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-10-15 03:12:17 +0000
commitd0e1da3264d438b4aef6bd836b5d48aa6a79884b (patch)
tree2aa96d8cdefd83d55bd6b0623fc58b7b1ed4b221 /lib/gitlab/diff
parent733ea49052ca10ed1c62fd66c54132ac8adf159c (diff)
downloadgitlab-ce-d0e1da3264d438b4aef6bd836b5d48aa6a79884b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/diff')
-rw-r--r--lib/gitlab/diff/file.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb
index 0ba23b8ffc7..1e6d80e1100 100644
--- a/lib/gitlab/diff/file.rb
+++ b/lib/gitlab/diff/file.rb
@@ -200,7 +200,7 @@ module Gitlab
Gitlab::Diff::Highlight.new(self, repository: self.repository).highlight
end
- # Array[<Hash>] with right/left keys that contains Gitlab::Diff::Line objects which text is hightlighted
+ # Array[<Hash>] with right/left keys that contains Gitlab::Diff::Line objects which text is highlighted
def parallel_diff_lines
@parallel_diff_lines ||= Gitlab::Diff::ParallelDiff.new(self).parallelize
end