Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
733ea49052
commit
d0e1da3264
|
@ -200,7 +200,7 @@ module Gitlab
|
||||||
Gitlab::Diff::Highlight.new(self, repository: self.repository).highlight
|
Gitlab::Diff::Highlight.new(self, repository: self.repository).highlight
|
||||||
end
|
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
|
def parallel_diff_lines
|
||||||
@parallel_diff_lines ||= Gitlab::Diff::ParallelDiff.new(self).parallelize
|
@parallel_diff_lines ||= Gitlab::Diff::ParallelDiff.new(self).parallelize
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue