Refactor resolvability checks based on type

1 files changed, 4 insertions, 5 deletions

diff --git a/app/models/note.rb b/app/models/note.rb
index cd4996bdbae..401e3d7bcbc 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -1,3 +1,6 @@
+# A note on the root of an issue, merge request, commit, or snippet.
+#
+# A note of this type is never resolvable.
 class Note < ActiveRecord::Base
   extend ActiveModel::Naming
   include Gitlab::CurrentSettings
@@ -225,11 +228,7 @@ class Note < ActiveRecord::Base
   end
 
   def can_be_discussion_note?
-    DiscussionNote::NOTEABLE_TYPES.include?(self.noteable_type) && !part_of_discussion?
-  end
-
-  def can_be_resolvable?
-    DiscussionNote::RESOLVABLE_TYPES.include?(self.noteable_type)
+    self.noteable.supports_discussions? && !part_of_discussion?
   end
 
   def discussion_class(noteable = nil)