diff options
| author | Ash McKenzie <ash@the-rebellion.net> | 2019-07-16 14:20:52 +1000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-07-18 12:13:19 +1000 |
| commit | d00d60a66deeacb19ccbd39501946ed646db64b6 (patch) | |
| tree | f13ec563c3cc12b2a6b7fcf2e436e963552304ef /lib | |
| parent | 9246fd5707c18553ab2904ba2c37ed4ddfe1b3a9 (diff) | |
| download | gitlab-ce-d00d60a66deeacb19ccbd39501946ed646db64b6.tar.gz | |
Allow UsageData.count to use count_by:
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/usage_data.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 7572c0bdbfd..f02d9f7d7e7 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -176,8 +176,8 @@ module Gitlab {} # augmented in EE end - def count(relation, fallback: -1) - relation.count + def count(relation, count_by: nil, fallback: -1) + count_by ? relation.count(count_by) : relation.count rescue ActiveRecord::StatementInvalid fallback end |