diff --git a/changelogs/unreleased/rf-remove-group-overview-security-dashboard-feature-flag.yml b/changelogs/unreleased/rf-remove-group-overview-security-dashboard-feature-flag.yml new file mode 100644 index 0000000000000000000000000000000000000000..f412ba11b91de942b7192192538cb3793ec2b65e --- /dev/null +++ b/changelogs/unreleased/rf-remove-group-overview-security-dashboard-feature-flag.yml @@ -0,0 +1,5 @@ +--- +title: Remove Security Dashboard feature flag +merge_request: 31820 +author: +type: other diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 038553c5dd7b35fdeb9c931849c62f6948ada2ed..1542905d2ce805417f87f5615d88b59ba62b9e30 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -100,9 +100,7 @@ def system_usage_data .merge(services_usage) .merge(approximate_counts) }.tap do |data| - if Feature.enabled?(:group_overview_security_dashboard) - data[:counts][:user_preferences] = user_preferences_usage - end + data[:counts][:user_preferences] = user_preferences_usage 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 588c68d1fb0fac2914dccbd963072f7a7fb61103..9bbd9394d572e5be5a478dff2a6ffabbb67dfe6b 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -154,11 +154,6 @@ expect(expected_keys - count_data.keys).to be_empty 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]