diff options
| -rw-r--r-- | lib/gitlab/usage_data.rb | 7 | ||||
| -rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 4f70d6b689d..a65f4a8639c 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -93,8 +93,11 @@ module Gitlab } .merge(services_usage) .merge(approximate_counts) - .merge(user_preferences: user_preferences_usage) - } + }.tap do |data| + if Feature.enabled?(:group_overview_security_dashboard) + data[:counts][:user_preferences] = user_preferences_usage + end + end end # rubocop: enable CodeReuse/ActiveRecord diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index 52edc46d5e4..d3eae80cc56 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -128,6 +128,11 @@ describe Gitlab::UsageData do )) end + it 'does not gather user preferences usage data when the feature is disabled' do + stub_feature_flags(group_overview_security_dashboard: false) + expect(subject[:counts].keys).not_to include(:user_preferences) + end + it 'gathers projects data correctly' do count_data = subject[:counts] |