diff options
Diffstat (limited to 'app/models/note.rb')
-rw-r--r-- | app/models/note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |