diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-11 12:10:20 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-11 12:10:20 +0000 |
| commit | c33a9adb709ffb40f816e66eb0c98cc750d6cd43 (patch) | |
| tree | 1a5b3e103d8d9677dc9a3271cd6093454c898bd8 /config | |
| parent | 7fa274753de913596db0d3eff5c7a3896c6fdd0a (diff) | |
| download | gitlab-ce-c33a9adb709ffb40f816e66eb0c98cc750d6cd43.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
4 files changed, 5 insertions, 12 deletions
diff --git a/config/feature_flags/development/find_remote_root_refs_inmemory.yml b/config/feature_flags/development/find_remote_root_refs_inmemory.yml index 18e2e2b366a..c78eadceaad 100644 --- a/config/feature_flags/development/find_remote_root_refs_inmemory.yml +++ b/config/feature_flags/development/find_remote_root_refs_inmemory.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329664 milestone: '13.12' type: development group: group::gitaly -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/user_group_counts.yml b/config/feature_flags/development/user_group_counts.yml deleted file mode 100644 index 98798ea3ead..00000000000 --- a/config/feature_flags/development/user_group_counts.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: user_group_counts -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44069/ -rollout_issue_url: -milestone: '13.6' -type: development -group: group::compliance -default_enabled: false diff --git a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml index b7567777135..c0fd0561ee4 100644 --- a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml +++ b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml @@ -6,7 +6,7 @@ product_stage: manage product_group: group::optimize product_category: value_type: number -status: data_available +status: removed time_frame: 28d data_source: redis_hll distribution: diff --git a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml index fef77d5c3ac..bbd3bfca2b2 100644 --- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml +++ b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml @@ -6,8 +6,9 @@ product_stage: manage product_group: group::optimize product_category: value_type: number -status: data_available -time_frame: all +status: removed +time_frame: 7d +data_source: redis_hll data_source: distribution: - ce |