diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 21:08:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 21:08:19 +0300 |
| commit | a8de96bff51846e160b76506dc0ca0fe6f767f64 (patch) | |
| tree | 1036f1ca75aba492eaaa3439c84a3109b4684896 /lib/gitlab/usage_data.rb | |
| parent | afe2b984524ae4b0c8a0636db7ec5b2c452f0734 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/usage_data.rb')
| -rw-r--r-- | lib/gitlab/usage_data.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 6e29a3e4cc4..09ea1c49c22 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -122,6 +122,8 @@ module Gitlab def cycle_analytics_usage_data Gitlab::CycleAnalytics::UsageData.new.to_json + rescue ActiveRecord::StatementInvalid + { avg_cycle_analytics: {} } end def features_usage_data @@ -232,7 +234,7 @@ module Gitlab end def count(relation, column = nil, fallback: -1, batch: true) - if batch && Feature.enabled?(:usage_ping_batch_counter) + if batch && Feature.enabled?(:usage_ping_batch_counter, default_enabled: true) Gitlab::Database::BatchCount.batch_count(relation, column) else relation.count @@ -242,7 +244,7 @@ module Gitlab end def distinct_count(relation, column = nil, fallback: -1, batch: true) - if batch && Feature.enabled?(:usage_ping_batch_counter) + if batch && Feature.enabled?(:usage_ping_batch_counter, default_enabled: true) Gitlab::Database::BatchCount.batch_distinct_count(relation, column) else relation.distinct_count_by(column) |