From f6f6aaf593dc40c79b8e3536f5e2821c96b9dcd3 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Wed, 15 Mar 2017 18:14:58 -0600
Subject: Better notification emails for notes and (diff) discussions

---
 app/models/diff_discussion.rb | 4 +++-
 app/models/discussion.rb      | 4 ++++
 app/models/note.rb            | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb
index 9a934c7520c..9c80b190b74 100644
--- a/app/models/diff_discussion.rb
+++ b/app/models/diff_discussion.rb
@@ -4,12 +4,14 @@ class DiffDiscussion < Discussion
   delegate  :line_code,
             :original_line_code,
             :diff_file,
+            :diff_line,
             :for_line?,
             :active?,
 
             to: :first_note
 
-  delegate  :blob,
+  delegate  :file_path,
+            :blob,
             :highlighted_diff_lines,
             :diff_lines,
 
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index 314aea2c63a..8ab9031e42c 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -87,6 +87,10 @@ class Discussion
     false
   end
 
+  def new_discussion?
+    notes.length == 1
+  end
+
   def potentially_resolvable?
     first_note.for_merge_request?
   end
diff --git a/app/models/note.rb b/app/models/note.rb
index 6385747b571..06ceb60b982 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -261,7 +261,7 @@ class Note < ActiveRecord::Base
   # Returns the entire discussion this note is part of
   def discussion
     if part_of_discussion?
-      self.noteable.notes.find_discussion(self.discussion_id)
+      self.noteable.notes.find_discussion(self.discussion_id) || to_discussion
     else
       to_discussion
     end
-- 
cgit v1.2.1