diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-02-20 10:23:34 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-02-20 10:23:34 +0100 |
commit | 0632e85c82eeb76c9b61e497655c9cf2ef5dc262 (patch) | |
tree | b078b750962b8bf8a2081a340bafe8e6253a032a /app/models/note.rb | |
parent | 6b0199ffc1c8e6a79b68a510052a1d1713afc29d (diff) | |
download | gitlab-ce-0632e85c82eeb76c9b61e497655c9cf2ef5dc262.tar.gz |
Fix commit comments on first line of diff not rendering in Merge Request Discussion view.
Diffstat (limited to 'app/models/note.rb')
-rw-r--r-- | app/models/note.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index ccd9783e7d4..e6c258ffbe9 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -409,19 +409,19 @@ class Note < ActiveRecord::Base prev_lines = [] diff_lines.each do |line| - if generate_line_code(line) != self.line_code - if line.type == "match" - prev_lines.clear - prev_match_line = line - else - prev_lines.push(line) - prev_lines.shift if prev_lines.length >= max_number_of_lines - end + if line.type == "match" + prev_lines.clear + prev_match_line = line else prev_lines << line - return prev_lines + + break if generate_line_code(line) == self.line_code + + prev_lines.shift if prev_lines.length >= max_number_of_lines end end + + prev_lines end def diff_lines |