diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-23 18:07:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-23 18:07:50 +0300 |
| commit | 676430584d388c5c1a59eec8ab0910ded09c1995 (patch) | |
| tree | 58125a10ad92344b802424de7e6c33cfc59881cb /config | |
| parent | 71355c5f36964482ae303c906505dc7138e2c7d7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/ci_artifacts_exclude.yml | 8 | ||||
| -rw-r--r-- | config/metrics/license/20210201124933_uuid.yml | 1 | ||||
| -rw-r--r-- | config/metrics/license/20210204124827_hostname.yml | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/config/feature_flags/development/ci_artifacts_exclude.yml b/config/feature_flags/development/ci_artifacts_exclude.yml deleted file mode 100644 index 172fe751dfe..00000000000 --- a/config/feature_flags/development/ci_artifacts_exclude.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_artifacts_exclude -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30708 -rollout_issue_url: -milestone: '13.0' -type: development -group: group::pipeline execution -default_enabled: true diff --git a/config/metrics/license/20210201124933_uuid.yml b/config/metrics/license/20210201124933_uuid.yml index afad2cf540a..aab2b3a641c 100644 --- a/config/metrics/license/20210201124933_uuid.yml +++ b/config/metrics/license/20210201124933_uuid.yml @@ -11,6 +11,7 @@ milestone: "9.1" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521 time_frame: none data_source: database +data_category: Standard instrumentation_class: UuidMetric distribution: - ee diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml index 40968500e13..27669c3f6c5 100644 --- a/config/metrics/license/20210204124827_hostname.yml +++ b/config/metrics/license/20210204124827_hostname.yml @@ -9,6 +9,7 @@ value_type: string status: data_available time_frame: none data_source: system +data_category: Standard instrumentation_class: HostnameMetric distribution: - ce |