diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-30 21:09:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-30 21:09:08 +0300 |
| commit | 861cc0c363283c359becb153d0f6e88393cd3e79 (patch) | |
| tree | b338ffd187d52d5ffdf7ae6ab08ccce0e45236a4 /config | |
| parent | 0daaf2c2ba5a0537094a53e7f84386616dbcbff0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
3 files changed, 3 insertions, 11 deletions
diff --git a/config/feature_flags/development/one_megabyte_file_size_limit.yml b/config/feature_flags/development/one_megabyte_file_size_limit.yml deleted file mode 100644 index 2bebebf8220..00000000000 --- a/config/feature_flags/development/one_megabyte_file_size_limit.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: one_megabyte_file_size_limit -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65167 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334916 -milestone: '14.1' -type: development -group: group::code review -default_enabled: false diff --git a/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json b/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json index 63a74061d91..1b38b110e9a 100644 --- a/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json +++ b/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json @@ -1,6 +1,6 @@ { "type": "object", - "description": "Histogram (buckets 1 to 100) of projects with at least 1 enabled integration" + "description": "Histogram (buckets 1 to 100) of projects with at least 1 enabled integration", "propertyNames": { "pattern": "^[1-9][0-9]?0?$" } diff --git a/config/metrics/objects_schemas/topology_schema.json b/config/metrics/objects_schemas/topology_schema.json index 013c9496069..e94c67ef55e 100644 --- a/config/metrics/objects_schemas/topology_schema.json +++ b/config/metrics/objects_schemas/topology_schema.json @@ -1,8 +1,8 @@ { "type": "object", - "required": ["duration", "failures"], + "required": ["duration_s", "failures"], "properties": { - "duration": { "type": "number", "description": "The time it took to collect topology data" }, + "duration_s": { "type": "number", "description": "The time it took to collect topology data" }, "failures": { "type": "array", "description": "The information about failed queries" }, "application_requests_per_hour": { "type": "number", "description": "The number of requests to the web application per hour" }, "nodes": { |