diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 09:08:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 09:08:42 +0000 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /generator_templates | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
download | gitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'generator_templates')
-rw-r--r-- | generator_templates/post_deployment_migration/post_deployment_migration/migration.rb (renamed from generator_templates/rails/post_deployment_migration/migration.rb) | 0 | ||||
-rw-r--r-- | generator_templates/usage_metric_definition/metric_definition.yml | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/generator_templates/rails/post_deployment_migration/migration.rb b/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb index 689d1de9d17..689d1de9d17 100644 --- a/generator_templates/rails/post_deployment_migration/migration.rb +++ b/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb diff --git a/generator_templates/usage_metric_definition/metric_definition.yml b/generator_templates/usage_metric_definition/metric_definition.yml index 209ff628eb5..1d84214d924 100644 --- a/generator_templates/usage_metric_definition/metric_definition.yml +++ b/generator_templates/usage_metric_definition/metric_definition.yml @@ -11,7 +11,8 @@ milestone: "<%= milestone %>" introduced_by_url: time_frame: <%= time_frame %> data_source: -data_category: Optional +data_category: optional +performance_indicator_type: distribution: <%= distribution %> tier: |