diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 11:41:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 11:41:52 +0300 |
| commit | 585826cb22ecea5998a2c2a4675735c94bdeedac (patch) | |
| tree | 5b05f0b30d33cef48963609e8a18a4dff260eab3 /generator_templates | |
| parent | df221d036e5d0c6c0ee4d55b9c97f481ee05dee8 (diff) | |
Add latest changes from gitlab-org/gitlab@16-6-stable-eev16.6.0-rc42
Diffstat (limited to 'generator_templates')
5 files changed, 5 insertions, 29 deletions
diff --git a/generator_templates/active_record/migration/create_table_migration.rb.tt b/generator_templates/active_record/migration/create_table_migration.rb.tt index e3eae729139..fbd21c28387 100644 --- a/generator_templates/active_record/migration/create_table_migration.rb.tt +++ b/generator_templates/active_record/migration/create_table_migration.rb.tt @@ -16,6 +16,7 @@ class <%= migration_class_name %> < Gitlab::Database::Migration[<%= Gitlab::Data # To disable transactions uncomment the following line and remove these # comments: # disable_ddl_transaction! + milestone '<%= Gitlab.current_milestone %>' # Add dependent 'batched_background_migrations.queued_migration_version' values. # DEPENDENT_BATCHED_BACKGROUND_MIGRATIONS = [] diff --git a/generator_templates/active_record/migration/migration.rb.tt b/generator_templates/active_record/migration/migration.rb.tt index 40481aed6ea..a8e715789e6 100644 --- a/generator_templates/active_record/migration/migration.rb.tt +++ b/generator_templates/active_record/migration/migration.rb.tt @@ -23,6 +23,7 @@ class <%= migration_class_name %> < Gitlab::Database::Migration[<%= Gitlab::Data # Add dependent 'batched_background_migrations.queued_migration_version' values. # DEPENDENT_BATCHED_BACKGROUND_MIGRATIONS = [] + milestone '<%= Gitlab.current_milestone %>' <%- if migration_action == 'add' -%> def change diff --git a/generator_templates/gitlab_internal_events/metric_definition.yml b/generator_templates/gitlab_internal_events/metric_definition.yml index 3b09544207c..c31f7d54df0 100644 --- a/generator_templates/gitlab_internal_events/metric_definition.yml +++ b/generator_templates/gitlab_internal_events/metric_definition.yml @@ -13,8 +13,8 @@ time_frame: <%= args.third %> data_source: internal_events data_category: optional instrumentation_class: <%= class_name(args.third) %> -distribution: <%= distributions %> -tier: <%= tiers %> +distribution:<%= distributions %> +tier:<%= tiers %> options: events: - <%= event %> diff --git a/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb.tt b/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb.tt index dbce7eb201e..005b1e9c5e9 100644 --- a/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb.tt +++ b/generator_templates/post_deployment_migration/post_deployment_migration/migration.rb.tt @@ -23,6 +23,7 @@ class <%= migration_class_name %> < Gitlab::Database::Migration[<%= Gitlab::Data # Add dependent 'batched_background_migrations.queued_migration_version' values. # DEPENDENT_BATCHED_BACKGROUND_MIGRATIONS = [] + milestone '<%= Gitlab.current_milestone %>' def up end diff --git a/generator_templates/snowplow_event_definition/event_definition.yml b/generator_templates/snowplow_event_definition/event_definition.yml deleted file mode 100644 index 475c2ef876f..00000000000 --- a/generator_templates/snowplow_event_definition/event_definition.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -description: -category: <%= event_category %> -action: <%= event_action %> -label_description: -property_description: -value_description: -extra_properties: -identifiers: -#- project -#- user -#- namespace -product_section: -product_stage: -product_group: -milestone: "<%= milestone %>" -introduced_by_url: -distributions: -<%= distributions %> -tiers: <% if ee? %> -#- premium -- ultimate -<% else %> -- free -- premium -- ultimate -<% end %> |