Commit b7f191c5 authored by Stan Hu's avatar Stan Hu

Merge branch 'rf-remove-group-overview-security-dashboard-feature-flag' into 'master'

Remove Security Dashboard feature flag

See merge request gitlab-org/gitlab-ce!31820
parents 2b48eec8 3fbc51d3
---
title: Remove Security Dashboard feature flag
merge_request: 31820
author:
type: other
...@@ -100,9 +100,7 @@ module Gitlab ...@@ -100,9 +100,7 @@ module Gitlab
.merge(services_usage) .merge(services_usage)
.merge(approximate_counts) .merge(approximate_counts)
}.tap do |data| }.tap do |data|
if Feature.enabled?(:group_overview_security_dashboard) data[:counts][:user_preferences] = user_preferences_usage
data[:counts][:user_preferences] = user_preferences_usage
end
end end
end end
# rubocop: enable CodeReuse/ActiveRecord # rubocop: enable CodeReuse/ActiveRecord
......
...@@ -154,11 +154,6 @@ describe Gitlab::UsageData do ...@@ -154,11 +154,6 @@ describe Gitlab::UsageData do
expect(expected_keys - count_data.keys).to be_empty expect(expected_keys - count_data.keys).to be_empty
end 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 it 'gathers projects data correctly' do
count_data = subject[:counts] count_data = subject[:counts]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment