From 261d47bce9d7cc80b4c2068cb612411fe51530ee Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Tue, 2 Aug 2016 09:20:22 +0100 Subject: Fix specs - Add match line header to expected result for `File#sections`. - Lowercase CSS colours. - Remove unused `diff_refs` keyword argument. - Rename `parent` -> `parent_file`, to be more explicit. - Skip an iteration when highlighting. --- lib/gitlab/diff/line.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/gitlab/diff') diff --git a/lib/gitlab/diff/line.rb b/lib/gitlab/diff/line.rb index 38400b48b5c..80a146b4a5a 100644 --- a/lib/gitlab/diff/line.rb +++ b/lib/gitlab/diff/line.rb @@ -5,10 +5,10 @@ module Gitlab attr_writer :rich_text attr_accessor :text - def initialize(text, type, index, old_pos, new_pos, parent: nil) + def initialize(text, type, index, old_pos, new_pos, parent_file: nil) @text, @type, @index = text, type, index @old_pos, @new_pos = old_pos, new_pos - @parent = parent + @parent_file = parent_file end def self.init_from_hash(hash) @@ -46,7 +46,7 @@ module Gitlab end def rich_text - @parent.highlight_lines! if @parent && !@rich_text + @parent_file.highlight_lines! if @parent_file && !@rich_text @rich_text end -- cgit v1.2.3