Backend tweaks

1 files changed, 13 insertions, 2 deletions

diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb
index 8c99be7df8a..e0c58b74380 100644
--- a/app/models/diff_note.rb
+++ b/app/models/diff_note.rb
@@ -76,7 +76,7 @@ class DiffNote < Note
   end
 
   def resolvable?
-    !system? && !for_commit?
+    !system? && for_merge_request?
   end
 
   def resolved?
@@ -103,10 +103,21 @@ class DiffNote < Note
     save!
   end
 
+  def discussion
+    return unless resolvable?
+
+    discussion_notes = self.noteable.notes.fresh.select { |n| n.discussion_id == self.discussion_id }
+    Discussion.new(discussion_notes)
+  end
+
+  def as_discussion
+    Discussion.new([self])
+  end
+
   private
 
   def supported?
-    !self.for_merge_request? || self.noteable.support_new_diff_notes?
+    for_commit? || self.noteable.support_new_diff_notes?
   end
 
   def set_original_position