diff options
author | Igor Drozdov <idrozdov@gitlab.com> | 2019-08-26 02:55:00 +0300 |
---|---|---|
committer | Igor Drozdov <idrozdov@gitlab.com> | 2019-08-28 08:30:13 +0300 |
commit | 72544449cfb8e35b8c044f5bfd08a2fae2253408 (patch) | |
tree | 9fb30b7c20955968f090a9f61582ad737f9afc4b /app/models/concerns/noteable.rb | |
parent | 7671c592f826f44be5a8a7dc947fba467f5df851 (diff) |
Change the way totalNotes is calculated
totalNotes is only used to prerender a number of
skeleton containers until real notes are loaded
issuable.discussions makes multiple requests, so
too expensive for this
This commit uses mere notes for this and sends
actual totalNotes number if it's less than 10;
otherwise it sends 10 - it allows us to avoid
bunch of skeleton prerenderings, which are not
necessary since they doesn't fit into the whole
screen and disappear quite fast
Diffstat (limited to 'app/models/concerns/noteable.rb')
-rw-r--r-- | app/models/concerns/noteable.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb index 4b428b0af83..6a44bc7c401 100644 --- a/app/models/concerns/noteable.rb +++ b/app/models/concerns/noteable.rb @@ -73,6 +73,10 @@ module Noteable .discussions(self) end + def capped_notes_count(max) + notes.limit(max).count + end + def grouped_diff_discussions(*args) # Doesn't use `discussion_notes`, because this may include commit diff notes # besides MR diff notes, that we do not want to display on the MR Changes tab. |