lib/gitlab_git/diff.rb in gitlab_git-7.1.4 vs lib/gitlab_git/diff.rb in gitlab_git-7.1.5
- old
+ new
@@ -214,11 +214,9 @@
# Grit's output
def strip_diff_headers(diff_text)
# Delete everything up to the first line that starts with '---' or
# 'Binary'
diff_text.sub!(/\A.*?^(---|Binary)/m, '\1')
- # Remove trailing newline because the tests ask for it
- diff_text.chomp!
if diff_text.start_with?('---') or diff_text.start_with?('Binary')
diff_text
else
# If the diff_text did not contain a line starting with '---' or