Commit 15985cbd authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch '213963-remove-feature-flag-usage_activity_by_stage' into 'master'

Remove feature flag usage_activity_by_stage

See merge request gitlab-org/gitlab!30464
parents 88f6ad2e 780a8f7a
......@@ -37,8 +37,6 @@ module EE
override :uncached_data
def uncached_data
return super if ::Feature.disabled?(:usage_activity_by_stage, default_enabled: true)
time_period = { created_at: 28.days.ago..Time.current }
usage_activity_by_stage_monthly = usage_activity_by_stage(:usage_activity_by_stage_monthly, time_period)
super.merge(usage_activity_by_stage).merge(usage_activity_by_stage_monthly)
......
......@@ -265,18 +265,7 @@ describe Gitlab::UsageData do
end
describe '.uncached_data' do
context 'when the :usage_activity_by_stage feature is not enabled' do
before do
stub_feature_flags(usage_activity_by_stage: false)
end
it "does not include usage_activity_by_stage data" do
expect(described_class.uncached_data).not_to include(:usage_activity_by_stage)
expect(described_class.uncached_data).not_to include(:usage_activity_by_stage_monthly)
end
end
context 'when the :usage_activity_by_stage feature is enabled' do
describe '.usage_activity_by_stage' do
it 'includes usage_activity_by_stage data' do
expect(described_class.uncached_data).to include(:usage_activity_by_stage)
expect(described_class.uncached_data).to include(:usage_activity_by_stage_monthly)
......
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