diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-07 20:35:39 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-07 20:35:39 +0000 |
| commit | 7838317a14ddb686a16e914f9dbfb393a6bf5099 (patch) | |
| tree | cdf70f6f056cff84ba9490c9399673ccdf3cb56f | |
| parent | af4d4e7067525e02eb2c17d2d0c524621c8ed345 (diff) | |
| parent | b7a5125f02865637ffbd4d7f8a623c994b861f0e (diff) | |
| download | gitlab-ce-7838317a14ddb686a16e914f9dbfb393a6bf5099.tar.gz | |
Merge branch 'fix_39233' into 'master'
fix #39233 - 500 in merge request
Closes #39233
See merge request gitlab-org/gitlab-ce!15774
| -rw-r--r-- | changelogs/unreleased/15774-fix-39233-500-in-merge-request.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/diff/inline_diff.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/diff/inline_diff_spec.rb | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/changelogs/unreleased/15774-fix-39233-500-in-merge-request.yml b/changelogs/unreleased/15774-fix-39233-500-in-merge-request.yml new file mode 100644 index 00000000000..1179b3f20e6 --- /dev/null +++ b/changelogs/unreleased/15774-fix-39233-500-in-merge-request.yml @@ -0,0 +1,5 @@ +--- +title: 'fix #39233 - 500 in merge request' +merge_request: 15774 +author: Martin Nowak +type: fixed 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 diff --git a/spec/lib/gitlab/diff/inline_diff_spec.rb b/spec/lib/gitlab/diff/inline_diff_spec.rb index 15451c2cf99..0a41362f606 100644 --- a/spec/lib/gitlab/diff/inline_diff_spec.rb +++ b/spec/lib/gitlab/diff/inline_diff_spec.rb @@ -31,6 +31,10 @@ describe Gitlab::Diff::InlineDiff do expect(subject[7]).to eq([17..17]) expect(subject[8]).to be_nil end + + it 'can handle unchanged empty lines' do + expect { described_class.for_lines(['- bar', '+ baz', '']) }.not_to raise_error + end end describe "#inline_diffs" do |