diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-08 06:11:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-08 06:11:31 +0000 |
| commit | 3d1cade13f61115b63bf6dbda5a1f194ba54b24b (patch) | |
| tree | e9edc13dbd28ba1eb4bbeb995f596ead2ad28b2c /app/models/commit.rb | |
| parent | 4040776430c2bbef689924c206e2c2c46428e4ef (diff) | |
| parent | f058b52b50c76de9557b167a1a31a5c9ba446f31 (diff) | |
| download | gitlab-ce-3d1cade13f61115b63bf6dbda5a1f194ba54b24b.tar.gz | |
Merge branch 'new-resolvable-discussion' into 'master'
Add option to start a new resolvable discussion in an MR
Closes #24378
See merge request !7527
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index ce92cc369ad..5c452f78546 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -2,6 +2,7 @@ class Commit extend ActiveModel::Naming include ActiveModel::Conversion + include Noteable include Participable include Mentionable include Referable @@ -203,6 +204,10 @@ class Commit project.notes.for_commit_id(self.id) end + def discussion_notes + notes.non_diff_notes + end + def notes_with_associations notes.includes(:author) end |