diff options
| author | Martin Nowak <code@dawg.eu> | 2017-12-06 19:10:53 +0100 |
|---|---|---|
| committer | Martin Nowak <code@dawg.eu> | 2017-12-07 20:19:37 +0100 |
| commit | b7a5125f02865637ffbd4d7f8a623c994b861f0e (patch) | |
| tree | baba27d1d0e839931f3b995fd6acd2dafe7c4f50 /lib/gitlab/diff | |
| parent | f1a98477014ceee1738a6994da9fd17dd4ccea00 (diff) | |
| download | gitlab-ce-b7a5125f02865637ffbd4d7f8a623c994b861f0e.tar.gz | |
fix #39233 - 500 in merge request
- handle unchanged empty lines in inline diff
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/inline_diff.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/inline_diff.rb b/lib/gitlab/diff/inline_diff.rb index 2d7b57120a6..54783a07919 100644 --- a/lib/gitlab/diff/inline_diff.rb +++ b/lib/gitlab/diff/inline_diff.rb @@ -70,7 +70,7 @@ module Gitlab def find_changed_line_pairs(lines) # Prefixes of all diff lines, indicating their types # For example: `" - + -+ ---+++ --+ -++"` - line_prefixes = lines.each_with_object("") { |line, s| s << line[0] }.gsub(/[^ +-]/, ' ') + line_prefixes = lines.each_with_object("") { |line, s| s << (line[0] || ' ') }.gsub(/[^ +-]/, ' ') changed_line_pairs = [] line_prefixes.scan(LINE_PAIRS_PATTERN) do |