diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 09:09:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 09:09:17 +0300 |
commit | 62d57690bc54e195b2544091725421144ce76900 (patch) | |
tree | 23a54295dd446cf9824e55d640ef22a23fbfe365 /spec/lib/gitlab/usage | |
parent | 17e74fcd4654243a4e4f2c1cfbb0d00508a0050e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/usage')
-rw-r--r-- | spec/lib/gitlab/usage/metrics/aggregates/aggregate_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/lib/gitlab/usage/metrics/aggregates/aggregate_spec.rb b/spec/lib/gitlab/usage/metrics/aggregates/aggregate_spec.rb index df92e367eb8..08b103a1179 100644 --- a/spec/lib/gitlab/usage/metrics/aggregates/aggregate_spec.rb +++ b/spec/lib/gitlab/usage/metrics/aggregates/aggregate_spec.rb @@ -142,6 +142,7 @@ RSpec.describe Gitlab::Usage::Metrics::Aggregates::Aggregate, :clean_gitlab_redi it 'does not calculate data for aggregates with ff turned off' do skip_feature_flags_yaml_validation + skip_default_enabled_yaml_check stub_feature_flags(enabled_feature_flag => true, disabled_feature_flag => false) allow(sources::RedisHll).to receive(:calculate_metrics_union).and_return(6) |