summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrossfuhrman <rfuhrman@gitlab.com>2019-08-14 13:13:28 -0500
committerrossfuhrman <rfuhrman@gitlab.com>2019-08-14 13:43:30 -0500
commit000a9b7d829174ad254c5684cab59f4fb176dce9 (patch)
tree04d332df95c9bc39e1d3618de74b780716487315
parentaffa81eb79ec0ca01a1a0c2733cc5cdffb3b9ff1 (diff)
downloadgitlab-ce-rf-remove-group-overview-security-dashboard-feature-flag.tar.gz
Remove Security Dashboard feature flagrf-remove-group-overview-security-dashboard-feature-flag
This removes the group_overview_security_dashboard feature flag
-rw-r--r--changelogs/unreleased/rf-remove-group-overview-security-dashboard-feature-flag.yml5
-rw-r--r--lib/gitlab/usage_data.rb4
-rw-r--r--spec/lib/gitlab/usage_data_spec.rb5
3 files changed, 6 insertions, 8 deletions
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 00000000000..f412ba11b91
--- /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 038553c5dd7..1542905d2ce 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -100,9 +100,7 @@ module Gitlab
.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 588c68d1fb0..9bbd9394d57 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -154,11 +154,6 @@ describe Gitlab::UsageData do
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]