diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-15 18:14:58 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | f6f6aaf593dc40c79b8e3536f5e2821c96b9dcd3 (patch) | |
| tree | 2291c4c92889f11e1bdbabe640205debb1e88029 /app/models | |
| parent | 76aa0bedd7ed3aaaeab9402b78261917df66de10 (diff) | |
| download | gitlab-ce-f6f6aaf593dc40c79b8e3536f5e2821c96b9dcd3.tar.gz | |
Better notification emails for notes and (diff) discussions
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/diff_discussion.rb | 4 | ||||
| -rw-r--r-- | app/models/discussion.rb | 4 | ||||
| -rw-r--r-- | app/models/note.rb | 2 |
3 files changed, 8 insertions, 2 deletions
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 |