mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-14 15:16:04 +10:00
Fix broken spec for submodule commit. #3945
This commit is contained in:
@@ -85,10 +85,14 @@ module Gitlab
|
||||
|
||||
case diff_line.type
|
||||
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'
|
||||
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
|
||||
|
||||
# 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
|
||||
|
||||
@lines
|
||||
@@ -121,6 +125,10 @@ module Gitlab
|
||||
lines.map! { |line| " #{line}" }
|
||||
end
|
||||
end
|
||||
|
||||
def submodules
|
||||
@submodules ||= diff_repository.raw_repository.submodules(diff_new_ref).keys
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user