diff options
author | Stan Hu <stanhu@gmail.com> | 2019-08-16 17:40:34 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-08-16 17:40:34 +0000 |
commit | b7f191c5d025f95f5f343f43b24878c68b5c72b3 (patch) | |
tree | 2dcd72811528a08951d13bd9d97776f4ea239202 | |
parent | 2b48eec8667006fc05061d90493b50fc052243c9 (diff) | |
parent | 3fbc51d33319404bffb5862cc271a83b18c7fddf (diff) | |
download | gitlab-ce-b7f191c5d025f95f5f343f43b24878c68b5c72b3.tar.gz |
Merge branch 'rf-remove-group-overview-security-dashboard-feature-flag' into 'master'62373-badge-counter-very-low-contrast-between-foreground-and-background-colors
Remove Security Dashboard feature flag
See merge request gitlab-org/gitlab-ce!31820
-rw-r--r-- | changelogs/unreleased/rf-remove-group-overview-security-dashboard-feature-flag.yml | 5 | ||||
-rw-r--r-- | lib/gitlab/usage_data.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 5 |
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] |