diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-24 00:10:25 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-24 00:10:25 +0000 |
| commit | 2bb4ea854228c3c9660d5cb55f59e2cafd1f33ec (patch) | |
| tree | fcfa3e96f7ecd7a3c229db5b31fb8b8b102c8581 /lib | |
| parent | 2cd6cc7feda8dcb914093e57f331fc15d18a6602 (diff) | |
| parent | 6b92236eeb74fa9854165c498a80f52e25e60e18 (diff) | |
| download | gitlab-ce-2bb4ea854228c3c9660d5cb55f59e2cafd1f33ec.tar.gz | |
Merge branch 'notes-count-without-system' into 'master'
Don't include system notes in issue/MR comment count.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2163.
See merge request !430
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/project_search_results.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index 8b85f3da83f..0dab7bcfa4d 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -67,7 +67,7 @@ module Gitlab end def notes - Note.where(project_id: limit_project_ids).search(query).order('updated_at DESC') + Note.where(project_id: limit_project_ids).user.search(query).order('updated_at DESC') end def limit_project_ids |