From dcbf7d13c41a3761b80c1297ad6f7859999797f9 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Sat, 5 Mar 2016 20:19:01 -0500 Subject: Make better use of the `Note#for_*?` methods We've got all these polymorphic type-checking methods, might as well use 'em everywhere it makes sense. --- app/models/note.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/note.rb b/app/models/note.rb index 1a7b2ba6d42..a473b5e7af3 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -87,7 +87,7 @@ class Note < ActiveRecord::Base next if discussion_ids.include?(note.discussion_id) # don't group notes for the main target - if !note.for_diff_line? && note.noteable_type == "MergeRequest" + if !note.for_diff_line? && note.for_merge_request? discussions << [note] else discussions << notes.select do |other_note| @@ -383,7 +383,7 @@ class Note < ActiveRecord::Base private def awards_supported? - (noteable.kind_of?(Issue) || noteable.is_a?(MergeRequest)) && !for_diff_line? + (for_issue? || for_merge_request?) && !for_diff_line? end def contains_emoji_only? -- cgit v1.2.1