diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-10 18:10:41 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-10 18:10:41 +0000 |
| commit | 7f04cb580bc7895145fc1df51907582f80adbbca (patch) | |
| tree | 31eb03182fcd84002895e3befb3d453bbcf048b4 /config | |
| parent | bd5eb9f0201cf39ecfb0e754787a2297d5fdf051 (diff) | |
| download | gitlab-ce-7f04cb580bc7895145fc1df51907582f80adbbca.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
4 files changed, 9 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 4d734c713fb..320cfbf824f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -47,6 +47,7 @@ module Gitlab config.eager_load_paths.push(*%W[#{config.root}/lib #{config.root}/app/models/badges #{config.root}/app/models/hooks + #{config.root}/app/models/integrations #{config.root}/app/models/members #{config.root}/app/models/project_services #{config.root}/app/graphql/resolvers/concerns diff --git a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml index b1009642dcc..9b9fa1779c7 100644 --- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml +++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml @@ -9,9 +9,10 @@ value_type: number status: data_available time_frame: 28d data_source: redis_hll +instrumentation_class: 'Gitlab::Usage::Metrics::Instrumentations::CountUsersUsingApproveQuickActionMetric' distribution: - ce -- ee +- ee tier: - free - premium diff --git a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml index f8c48ac20f9..3754b20fb6e 100644 --- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml +++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml @@ -9,10 +9,11 @@ value_type: number status: data_available time_frame: 7d data_source: redis_hll +instrumentation_class: 'Gitlab::Usage::Metrics::Instrumentations::CountUsersUsingApproveQuickActionMetric' distribution: - ce -- ee +- ee tier: - free - premium -- ultimate
\ No newline at end of file +- ultimate diff --git a/config/metrics/schema.json b/config/metrics/schema.json index e9e3ac5ef40..66d2ee4ca03 100644 --- a/config/metrics/schema.json +++ b/config/metrics/schema.json @@ -43,6 +43,9 @@ "introduced_by_url": { "type": ["string", "null"] }, + "extra": { + "type": "object" + }, "time_frame": { "type": "string", "enum": ["7d", "28d", "all", "none"] |