Commit fed10766 authored by Rubén Dávila's avatar Rubén Dávila

Fix broken spec for submodule commit. #3945

parent 164c6374
...@@ -85,10 +85,14 @@ module Gitlab ...@@ -85,10 +85,14 @@ module Gitlab
case diff_line.type case diff_line.type
when 'new', nil when 'new', nil
diff_line.text = new_lines[diff_line.new_pos - 1].try(:gsub!, /\A\s/, line_prefix) line = new_lines[diff_line.new_pos - 1]
when 'old' when 'old'
diff_line.text = old_lines[diff_line.old_pos - 1].try(:gsub!, /\A\s/, line_prefix) line = old_lines[diff_line.old_pos - 1]
end end
# Only update text if line is found. This will prevent
# issues with submodules given the line only exists in diff content.
diff_line.text = line.gsub!(/\A\s/, line_prefix) if line
end end
@lines @lines
...@@ -121,6 +125,10 @@ module Gitlab ...@@ -121,6 +125,10 @@ module Gitlab
lines.map! { |line| " #{line}" } lines.map! { |line| " #{line}" }
end end
end end
def submodules
@submodules ||= diff_repository.raw_repository.submodules(diff_new_ref).keys
end
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment